From: Mo DeJong <supermo@bayarea.net>
Date: Thu, 15 Nov 2001 00:47:39 +0000 (+0000)
Subject: * ltmain.in: Place parens around a generated relink_command
X-Git-Tag: release-1-4-3~39
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7131637b1abefe391feb71d91601cd5ed03a6acb;p=thirdparty%2Flibtool.git

* ltmain.in: Place parens around a generated relink_command
so it is run is a subshell. This avoids an install error
where libtool ended up in the wrong directory after
relinking a .la file.
---

diff --git a/ChangeLog b/ChangeLog
index 5292c7207..fe750b6f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-15   Mo DeJong  <supermo@bayarea.net>
+
+	* ltmain.in: Place parens around a generated relink_command
+	so it is run is a subshell. This avoids an install error
+	where libtool ended up in the wrong directory after
+	relinking a .la file.
+
 2001-11-15  Guido Draheim <guidod@gmx.de>
 
 	* ltmain.in: Display better and different error messages when
diff --git a/ltmain.in b/ltmain.in
index a87699771..254ec2b59 100644
--- a/ltmain.in
+++ b/ltmain.in
@@ -2513,7 +2513,7 @@ EOF
 		  echo "*** Warning: dynamic linker does not accept needed library $i."
 		  echo "*** I have the capability to make that library automatically link in when"
 		  echo "*** you link to this library.  But I can only do this if you have a"
-		  echo "*** shared version of the library, which I believe you do not have" 
+		  echo "*** shared version of the library, which I believe you do not have"
 		  echo "*** because a test_compile did reveal that the linker did not use it for"
 		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
 		fi
@@ -3555,7 +3555,7 @@ static const void *lt_preloaded_setup() {
 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
 	  fi
 	done
-	relink_command="cd `pwd`; $relink_command"
+	relink_command="(cd `pwd`; $relink_command)"
 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
       fi
 
@@ -3885,7 +3885,7 @@ fi\
 	fi
       done
       # Quote the link command for shipping.
-      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
+      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
 
       # Only create the output if not a dry run.