libtool-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[FYI] Fix sh.test failure


From: Scott James Remnant
Subject: [FYI] Fix sh.test failure
Date: Fri, 13 Feb 2004 01:56:33 +0000

In the previous intent/typo clean-up patch I accidentally introduced
something that caused sh.test to fail, so I've reverted that one line
change.

Also I noticed while finding out why sh.test fails that it assumes
config/ltmain.sh and libtoolize are under $srcdir, when in fact they're
in the build directory, so fixed that too.

CVS HEAD now works again :-)

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

diff -ruNp libtool-CVS~/ChangeLog libtool-CVS/ChangeLog
--- libtool-CVS~/ChangeLog      2004-02-13 00:57:30.000000000 +0000
+++ libtool-CVS/ChangeLog       2004-02-13 01:30:03.000000000 +0000
@@ -0,0 +1,8 @@
+2004-02-13  Scott James Remnant  <address@hidden>
+
+       * tests/sh.test: Test the config/ltmain.sh and libtoolize in the
+       build directory not the source directory, where they won't exist
+       during 'make distcheck'.
+       * ltmain.in: Revert one line of previous intendation clean-up
+       to enable one of the sh.test checks to pass.
+
diff -ruNp libtool-CVS~/ltmain.in libtool-CVS/ltmain.in
--- libtool-CVS~/ltmain.in      2004-02-12 23:43:48.000000000 +0000
+++ libtool-CVS/ltmain.in       2004-02-13 01:29:33.000000000 +0000
@@ -3545,8 +3545,8 @@ EOF
          ;;
        none | unknown | *)
          newdeplibs=""
-         tmp_deplibs=`$echo "X $deplibs" |
-           $Xsed -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+         tmp_deplibs=`$echo "X $deplibs" | $Xsed \
+             -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
          if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
            for i in $predeps $postdeps ; do
              # can't use Xsed below, because $i might contain '/'
diff -ruNp libtool-CVS~/tests/sh.test libtool-CVS/tests/sh.test
--- libtool-CVS~/tests/sh.test  2004-01-22 15:27:25.000000000 +0000
+++ libtool-CVS/tests/sh.test   2004-02-13 01:29:01.000000000 +0000
@@ -29,7 +29,7 @@ fi
 
 # Check all the "portable" shell scripts.
 status=$EXIT_SUCCESS
-scripts="$srcdir/../config/ltmain.sh $srcdir/../libtoolize"
+scripts="../config/ltmain.sh ../libtoolize"
 
 # Check for bad binary operators.
 if $EGREP -n -e 'if[   ]+["'\'']?\\$[^         ]+[     
]+(=|-[lg][te]|-eq|-ne)' $scripts; then

Attachment: signature.asc
Description: This is a digitally signed message part


reply via email to

[Prev in Thread] Current Thread [Next in Thread]