From: Scott James Remnant <scott@netsplit.com>
Date: Fri, 13 Feb 2004 01:57:52 +0000 (+0000)
Subject: * tests/sh.test: Test the config/ltmain.sh and libtoolize in the
X-Git-Tag: release-1-9b~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e97e38544f990e001a313971a562f39a42ede7;p=thirdparty%2Flibtool.git

* 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 --git a/ChangeLog b/ChangeLog
index ce33d9144..e0bb01276 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2004-02-13  Scott James Remnant  <scott@netsplit.com>
 
+	* 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.
+
 	* tests/cdemo/configure.ac: Drop AC_PREREQ back to 2.54, this
 	was debris from Gary's cvsapply going mad and wasn't backed
 	out.
diff --git a/ltmain.in b/ltmain.in
index 6ed781d47..db2d21eaf 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -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 --git a/tests/sh.test b/tests/sh.test
index 24803e8ea..dcfb3a850 100755
--- a/tests/sh.test
+++ b/tests/sh.test
@@ -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