* tests/build-relink2.test: look for installed libl3.la

in $prefix/lib/ as well as $prefix/lib/extra/.

diff --git a/ChangeLog b/ChangeLog
index 943a1829d918761cd01fbd54f2e1977dca8db7cc..442862f5f2846c3b9235b6f44f9bff475c5912b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-30  Charles Wilson  <cwilson@ece.gatech.edu>
+
+       * tests/build-relink2.test: look for installed libl3.la
+       in $prefix/lib/ as well as $prefix/lib/extra/.
+
 2002-05-30  Gary V. Vaughan  <gary@gnu.org>
 
        * tests/hardcode.test: Use libtool --config to collect the

diff --git a/tests/build-relink2.test b/tests/build-relink2.test
index 42fe1e7e1b8228049839b38e528502b8666c5f69..52f940832dcb644c66f9ec0461672a86045c870e 100755 (executable)
--- a/tests/build-relink2.test
+++ b/tests/build-relink2.test
@@ -11,7 +11,8 @@ fi
 . $srcdir/defs || exit 1
 
 # Check that things are built.
-if test -f $prefix/lib/extra/libl3.la && cd ../depdemo && test -f l3/libl3.la; then :
+if (test -f $prefix/lib/extra/libl3.la || test -f $prefix/lib/libl3.la) \
+    && cd ../depdemo && test -f l3/libl3.la; then :
 else
   echo "You must run depdemo-inst.test before $0" 1>&2
   exit 77