From 6280a6a00af9e0f916610a769b780951b2c84e0e Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Wed, 2 May 2012 14:46:44 +0000
Subject: [PATCH] Construct the path to extra libraries from builddir and not
 top_builddir. Merge the patch from Naohiko Shimizu <nshimizu@ip-arch.jp> for
 better compatibility with pharosc (Graham Petley).

---
 alliance/src/boog/src/Makefile.am      | 34 +++++++++++++-------------
 alliance/src/boog/src/bog_lib_reader.c |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/alliance/src/boog/src/Makefile.am b/alliance/src/boog/src/Makefile.am
index e0501631..7e8062df 100644
--- a/alliance/src/boog/src/Makefile.am
+++ b/alliance/src/boog/src/Makefile.am
@@ -11,23 +11,23 @@ AM_CFLAGS =  -I$(top_srcdir)/abe/src \
 bin_PROGRAMS = boog
 
 boog_LDADD = @ALLIANCE_LIBS@ \
--L$(top_builddir)/abv/src \
--L$(top_builddir)/abe/src \
--L$(top_builddir)/abt/src \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbkvti/src \
--L$(top_builddir)/mbkal/src \
--L$(top_builddir)/mbkspice/src \
--L$(top_builddir)/mbkhilo/src \
--L$(top_builddir)/mbkedif/src \
--L$(top_builddir)/mbkvhdlg/src \
--L$(top_builddir)/mbkvrlog/src \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/mbk/src \
--L$(top_builddir)/bdd/src \
--L$(top_builddir)/abl/src \
--L$(top_builddir)/aut/src \
--L$(top_builddir)/mbk/src \
+-L$(builddir)/../../abv/src \
+-L$(builddir)/../../abe/src \
+-L$(builddir)/../../abt/src \
+-L$(builddir)/../../mbk/src \
+-L$(builddir)/../../mbkvti/src \
+-L$(builddir)/../../mbkal/src \
+-L$(builddir)/../../mbkspice/src \
+-L$(builddir)/../../mbkhilo/src \
+-L$(builddir)/../../mbkedif/src \
+-L$(builddir)/../../mbkvhdlg/src \
+-L$(builddir)/../../mbkvrlog/src \
+-L$(builddir)/../../mbk/src \
+-L$(builddir)/../../mbk/src \
+-L$(builddir)/../../bdd/src \
+-L$(builddir)/../../abl/src \
+-L$(builddir)/../../aut/src \
+-L$(builddir)/../../mbk/src \
           -lAbv -lAbe -lAbt -lMlu -lMcl -lMal -lMsl -lMhl -lMel -lMvg -lMgl -lRcn -lMlo -lBdd -lAbl -lAut -lMut
 	   
 boog_SOURCES = \
diff --git a/alliance/src/boog/src/bog_lib_reader.c b/alliance/src/boog/src/bog_lib_reader.c
index edc419cc..6bad5190 100644
--- a/alliance/src/boog/src/bog_lib_reader.c
+++ b/alliance/src/boog/src/bog_lib_reader.c
@@ -150,7 +150,7 @@ static int distribCell(befig_list* befig)
          }
 
          /*patterns aren't equal, new is more precise*/
-         if (!biabl_befig) break;
+         if (!biabl_befig) continue;
          
          /*patterns are equal -->comparison*/
          if (cell->AREA<getgenericarea(befig)) return 0;  /*don't use the new*/
@@ -224,7 +224,7 @@ static int distribCell(befig_list* befig)
          }
 
          /*patterns aren't equal, new is more precise*/
-         if (!biabl_befig) break;
+         if (biabl_befig) continue;
          
          /*patterns are equal -->comparison*/
          if (cell->AREA<getgenericarea(befig)) return 0;  /*don't use the new*/