* ltmain.in ($PATH): instead of modifying the PATH, better prevent

its expansion the first time *_cmds variables are eval'ed.  Modify
$show within loops that eval them so as to expand variables
* ltconfig.in (*_cmds): quote $ so that they're not expanded by
the first eval

diff --git a/ChangeLog b/ChangeLog
index 0ef976674ba58657d9a9a7428f8d6264a4965297..0557c0537cab25db3a6be00e523babe60f68d5b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-03-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * ltmain.in ($PATH): instead of modifying the PATH, better prevent 
+       its expansion the first time *_cmds variables are eval'ed.  Modify 
+       $show within loops that eval them so as to expand variables
+       * ltconfig.in (*_cmds): quote $ so that they're not expanded by
+       the first eval
+
 1999-03-25  Gary V. Vaughan  <gvaughan@oranda.demon.co.uk>
 
        * ltmain.in ($PATH):  Expand any tildes in the users path to the

diff --git a/ltconfig.in b/ltconfig.in
index 54c6beb9433003fa16678d25e537cbf17958545c..a1f2995b348719e54b0721524a6eb5522038a1c3 100755 (executable)
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -456,8 +456,8 @@ aix3*)
 esac
 
 # Determine commands to create old-style static archives.
-old_archive_cmds='$AR cru $oldlib$oldobjs'
-old_postinstall_cmds='chmod 644 $oldlib'
+old_archive_cmds='\$AR cru \$oldlib\$oldobjs'
+old_postinstall_cmds='chmod 644 \$oldlib'
 old_postuninstall_cmds=
 
 # Set a sane default for `AR'.
@@ -1007,7 +1007,7 @@ hardcode_minus_L=no
 hardcode_shlibpath_var=unsupported
 runpath_var=
 always_export_symbols=no
-export_symbols_cmds='$NM $libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+export_symbols_cmds='\$NM \$libobjs | \$global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > \$export_symbols'
 # include_expsyms should be a list of space-separated symbols to be *always*
 # included in the symbol list
 include_expsyms=
@@ -1055,7 +1055,7 @@ EOF
     ;;
 
   amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+    archive_cmds='\$rm \$objdir/a2ixlibrary.data~\$echo "#define NAME \$libname" > \$objdir/a2ixlibrary.data~\$echo "#define LIBRARY_ID 1" >> \$objdir/a2ixlibrary.data~\$echo "#define VERSION \$major" >> \$objdir/a2ixlibrary.data~\$echo "#define REVISION \$revision" >> \$objdir/a2ixlibrary.data~\$AR cru \$lib \$libobjs~\$RANLIB \$lib~(cd \$objdir && a2ixlibrary -32)'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
 
@@ -1069,7 +1069,7 @@ EOF
     ;;
 
   sunos4*)
-    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -assert pure-text -Bstatic -o \$lib \$libobjs \$deplibs \$linkopts'
     wlarc=
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -1077,7 +1077,7 @@ EOF
 
   beos*)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
+      archive_cmds='\$CC -nostart \$libobjs \$deplibs \$linkopts \${wl}-soname \$wl\$soname -o \$lib'
     else
       ld_shlibs=no
     fi
@@ -1093,31 +1093,31 @@ EOF
     # Extract the symbol export list from an `--export-all' def file,
     # then regenerate the def file from the symbol export list, so that
     # the compiled dll only exports the symbol export list.
-    export_symbols_cmds='rm -f $objdir/$soname-ltdll.c~
-      sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
-      (cd $objdir && $CC -c $soname-ltdll.c)~
-      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs~
-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < $objdir/$soname-def > $export_symbols'
+    export_symbols_cmds='rm -f \$objdir/\$soname-ltdll.c~
+      sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < \$0 > \$objdir/\$soname-ltdll.c~
+      (cd \$objdir && \$CC -c \$soname-ltdll.c)~
+      \$DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def \$objdir/\$soname-def  \$objdir/\$soname-ltdll.\$objext \$libobjs~
+      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]* ; *//" < \$objdir/\$soname-def > \$export_symbols'
 
-    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
+    archive_expsym_cmds='echo EXPORTS > \$objdir/\$soname-def~
       _lt_hint=1;
-      for symbol in `cat $export_symbols`; do
-       echo "  \$symbol @ \$_lt_hint ; " >> $objdir/$soname-def;
+      for symbol in `cat \$export_symbols`; do
+       echo "  \$symbol @ \$_lt_hint ; " >> \$objdir/\$soname-def;
        _lt_hint=`expr 1 + \$_lt_hint`;
       done~
-      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
-      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
+      \$CC -Wl,--base-file,\$objdir/\$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o \$lib \$objdir/\$soname-ltdll.\$objext \$libobjs \$deplibs \$linkopts~
+      \$DLLTOOL --as=\$AS --dllname \$soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def \$objdir/\$soname-def --base-file \$objdir/\$soname-base --output-exp \$objdir/\$soname-exp~
+      \$CC -Wl,--base-file,\$objdir/\$soname-base \$objdir/\$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o \$lib \$objdir/\$soname-ltdll.\$objext \$libobjs \$deplibs \$linkopts~
+      \$DLLTOOL --as=\$AS --dllname \$soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def \$objdir/\$soname-def --base-file \$objdir/\$soname-base --output-exp \$objdir/\$soname-exp~
+      \$CC \$objdir/\$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o \$lib \$objdir/\$soname-ltdll.\$objext \$libobjs \$deplibs \$linkopts'
 
-      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a'
+      old_archive_from_new_cmds='\$DLLTOOL --as=\$AS --dllname \$soname --def \$objdir/\$soname-def --output-lib \$objdir/\$libname.a'
     ;;
 
   *)
     if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      archive_cmds='\$CC -shared \$libobjs \$deplibs \$linkopts \${wl}-soname \$wl\$soname -o \$lib'
+      archive_expsym_cmds='\$CC -shared \$libobjs \$deplibs \$linkopts \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib'
     else
       ld_shlibs=no
     fi
@@ -1136,7 +1136,7 @@ else
   aix3*)
     allow_undefined_flag=unsupported
     always_export_symbols=yes
-    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
+    archive_expsym_cmds='\$LD -o \$objdir/\$soname \$libobjs \$deplibs \$linkopts -bE:\$export_symbols -T512 -H512 -bM:SRE~\$AR cru \$lib \$objdir/\$soname'
     # Note: this linker hardcodes the directories in LIBPATH if there
     # are no directories specified by -L.
     hardcode_minus_L=yes
@@ -1159,10 +1159,10 @@ else
        # We have old collect2
        hardcode_direct=unsupported
       fi
-      archive_cmds='$CC -shared ${wl}-bnoentry -o $objdir/$soname $libobjs $deplibs $linkopts'
+      archive_cmds='\$CC -shared \${wl}-bnoentry -o \$objdir/\$soname \$libobjs \$deplibs \$linkopts'
     else
       always_export_symbols=yes
-      archive_expsym_cmds='$CC -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bM:SRE ${wl}-bnoentry'
+      archive_expsym_cmds='\$CC -o \$objdir/\$soname \$libobjs \$deplibs \$linkopts \${wl}-bE:\$export_symbols \${wl}-bM:SRE \${wl}-bnoentry'
       hardcode_direct=yes
     fi
     hardcode_minus_L=yes
@@ -1173,7 +1173,7 @@ else
    ;;
 
   amigaos*)
-    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+    archive_cmds='\$rm \$objdir/a2ixlibrary.data~\$echo "#define NAME \$libname" > \$objdir/a2ixlibrary.data~\$echo "#define LIBRARY_ID 1" >> \$objdir/a2ixlibrary.data~\$echo "#define VERSION \$major" >> \$objdir/a2ixlibrary.data~\$echo "#define REVISION \$revision" >> \$objdir/a2ixlibrary.data~\$AR cru \$lib \$libobjs~\$RANLIB \$lib~(cd \$objdir && a2ixlibrary -32)'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
     ;;
@@ -1188,11 +1188,11 @@ else
     # Tell ltmain to make .lib files, not .a files.
     libext=lib
     # FIXME: Setting linknames here is a bad hack.
-    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+    archive_cmds='\$CC -o \$lib \$libobjs \$linkopts `echo "\$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
     # The linker will automatically build a .lib file if we build a DLL.
     old_archive_from_new_cmds='true'
     # FIXME: Should let the user specify the lib program.
-    old_archive_cmds='lib /OUT:$oldlib$oldobjs'
+    old_archive_cmds='lib /OUT:\$oldlib\$oldobjs'
     fix_srcfile_path='`cygpath -w $srcfile`'
     ;;
 
@@ -1206,7 +1206,7 @@ else
   # does not break anything, and helps significantly (at the cost of a little
   # extra space).
   freebsd2.2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
+    archive_cmds='\$LD -Bshareable -o \$lib \$libobjs \$deplibs \$linkopts /usr/lib/c++rt0.o'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -1214,7 +1214,7 @@ else
 
   # Unfortunately, older versions of FreeBSD 2 do not have this feature.
   freebsd2*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -Bshareable -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_direct=yes
     hardcode_minus_L=yes
     hardcode_shlibpath_var=no
@@ -1222,14 +1222,14 @@ else
 
   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
   freebsd*)
-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$CC -shared -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
     ;;
 
   hpux9*)
-    archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
+    archive_cmds='\$rm \$objdir/\$soname~\$LD -b +b \$install_libdir -o \$objdir/\$soname \$libobjs \$deplibs \$linkopts~test \$objdir/\$soname = \$lib || mv \$objdir/\$soname \$lib'
     hardcode_libdir_flag_spec='${wl}+s ${wl}+b ${wl}$libdir'
     hardcode_libdir_separator=:
     hardcode_direct=yes
@@ -1237,7 +1237,7 @@ else
     ;;
 
   hpux10* | hpux11*)
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -b +h \$soname +b \$install_libdir -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_libdir_flag_spec='${wl}+s ${wl}+b ${wl}$libdir'
     hardcode_libdir_separator=:
     hardcode_direct=yes
@@ -1246,9 +1246,9 @@ else
 
   irix5* | irix6*)
     if test "$with_gcc" = yes; then
-      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+      archive_cmds='\$CC -shared \$libobjs \$deplibs \$linkopts \${wl}-soname \${wl}\$soname `test -n "\$verstring" && echo \${wl}-set_version \${wl}\$verstring` -o \$lib'
     else
-      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
+      archive_cmds='\$LD -shared \$libobjs \$deplibs \$linkopts -soname \$soname `test -n "\$verstring" && echo -set_version \$verstring` -o \$lib'
     fi
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
@@ -1256,9 +1256,9 @@ else
 
   netbsd*)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
+      archive_cmds='\$LD -Bshareable -o \$lib \$libobjs \$deplibs \$linkopts'  # a.out
     else
-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
+      archive_cmds='\$LD -shared -o \$lib \$libobjs \$deplibs \$linkopts'      # ELF
     fi
     hardcode_libdir_flag_spec='${wl}-R$libdir'
     hardcode_direct=yes
@@ -1266,7 +1266,7 @@ else
     ;;
 
   openbsd*)
-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -Bshareable -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_direct=yes
     hardcode_shlibpath_var=no
@@ -1276,24 +1276,24 @@ else
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_minus_L=yes
     allow_undefined_flag=unsupported
-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
-    old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
+    archive_cmds='\$echo "LIBRARY \$libname INITINSTANCE" > \$objdir/\$libname.def~\$echo "DESCRIPTION \"\$libname\"" >> \$objdir/\$libname.def~\$echo DATA >> \$objdir/\$libname.def~\$echo " SINGLE NONSHARED" >> \$objdir/\$libname.def~\$echo EXPORTS >> \$objdir/\$libname.def~emxexp \$libobjs >> \$objdir/\$libname.def~\$CC -Zdll -Zcrtdll -o \$lib \$libobjs \$deplibs \$linkopts \$objdir/\$libname.def'
+    old_archive_from_new_cmds='emximp -o \$objdir/\$libname.a \$objdir/\$libname.def'
     ;;
 
   osf3* | osf4*)
     if test "$with_gcc" = yes; then
       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+      archive_cmds='\$CC -shared${allow_undefined_flag} \$libobjs \$deplibs \$linkopts \${wl}-soname \${wl}\$soname `test -n "\$verstring" && echo \${wl}-set_version \${wl}\$verstring` -o \$lib'
     else
       allow_undefined_flag=' -expect_unresolved \*'
-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
+      archive_cmds='\$LD -shared${allow_undefined_flag} \$libobjs \$deplibs \$linkopts -soname \$soname `test -n "\$verstring" && echo -set_version \$verstring` -o \$lib'
     fi
     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
     ;;
 
   sco3.2v5*)
-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -G -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_direct=yes
     ;;
 
@@ -1301,9 +1301,9 @@ else
     no_undefined_flag=' -z text'
     # $CC -shared without GNU ld will not create a library from C++
     # object files and a static libstdc++, better avoid it by now
-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-               $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
+    archive_cmds='\$LD -G${allow_undefined_flag} -h \$soname -o \$lib \$libobjs \$deplibs \$linkopts'
+    archive_expsym_cmds='\$echo "{ global:" > \$lib.exp~cat \$export_symbols | sed -e "s/\(.*\)/\1;/" >> \$lib.exp~\$echo "local: *; };" >> \$lib.exp~
+               \$LD -G${allow_undefined_flag} -M \$lib.exp -h \$soname -o \$lib \$libobjs \$deplibs \$linkopts~\$rm \$lib.exp'
     hardcode_libdir_flag_spec='-R$libdir'
     hardcode_shlibpath_var=no
     ;;
@@ -1312,9 +1312,9 @@ else
     # Why do we need -Bstatic?  To avoid inter-library dependencies, maybe...
     if test "$with_gcc" = yes; then
       # Use -fPIC here because libgcc is multilibbed
-      archive_cmds='$CC -shared ${wl}-Bstatic -fPIC -o $lib $libobjs $deplibs $linkopts'
+      archive_cmds='\$CC -shared \${wl}-Bstatic -fPIC -o \$lib \$libobjs \$deplibs \$linkopts'
     else
-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
+      archive_cmds='\$LD -assert pure-text -Bstatic -o \$lib \$libobjs \$deplibs \$linkopts'
     fi
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_direct=yes
@@ -1323,19 +1323,19 @@ else
     ;;
 
   sysv4.3*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -G -h \$soname -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_shlibpath_var=no
     export_dynamic_flag_spec='-Bexport'
     ;;
 
   uts4*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -G -h \$soname -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_shlibpath_var=no
     ;;
 
   dgux*)
-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
+    archive_cmds='\$LD -G -h \$soname -o \$lib \$libobjs \$deplibs \$linkopts'
     hardcode_libdir_flag_spec='-L$libdir'
     hardcode_shlibpath_var=no
     ;;
@@ -1561,7 +1561,7 @@ echo "$ac_t$hardcode_action" 1>&6
 
 
 reload_flag=
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+reload_cmds='\$LD\$reload_flag -o \$output\$reload_objs'
 echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
 # PORTME Some linkers may need a different reload flag.
 reload_flag='-r'
@@ -1637,7 +1637,7 @@ bsdi4*)
   version_type=linux
   library_names_spec='${libname}.so$major ${libname}.so'
   soname_spec='${libname}.so'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig $libdir'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig \$libdir'
   shlibpath_var=LD_LIBRARY_PATH
   deplibs_check_method='file_magic ELF 32-bit LSB shared object'
   file_magic_cmd=/usr/bin/file
@@ -1688,7 +1688,7 @@ freebsd*)
       need_version=yes
       ;;
   esac
-  finish_cmds='PATH="$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m $libdir'
+  finish_cmds='PATH="\$PATH:/sbin" OBJFORMAT="'"$objformat"'" ldconfig -m \$libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -1710,7 +1710,7 @@ hpux9* | hpux10* | hpux11*)
   library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
   soname_spec='${libname}${release}.sl$major'
   # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
+  postinstall_cmds='chmod 555 \$lib'
   ;;
 
 irix5*)
@@ -1761,7 +1761,7 @@ linux-gnu*)
   need_version=no
   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
   soname_spec='${libname}${release}.so$major'
-  finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n \$libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
   deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
@@ -1783,7 +1783,7 @@ netbsd*)
   version_type=sunos
   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
     library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-    finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m \$libdir'
     dynamic_linker='NetBSD (a.out) ld.so'
   else
     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
@@ -1800,7 +1800,7 @@ openbsd*)
     need_version=no
   fi
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m \$libdir'
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
@@ -1845,7 +1845,7 @@ solaris*)
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
+  postinstall_cmds='chmod +x \$lib'
   deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
   file_magic_cmd=/usr/bin/file
   file_magic_test_file=/lib/libc.so
@@ -1854,7 +1854,7 @@ solaris*)
 sunos4*)
   version_type=sunos
   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig \$libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
   if test "$with_gnu_ld" = yes; then
@@ -1935,7 +1935,7 @@ aix3*)
   test "$enable_shared" = yes && enable_static=no
   if test -n "$RANLIB"; then
     archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
+    postinstall_cmds='\$RANLIB \$lib'
   fi
   ;;
 

diff --git a/ltmain.in b/ltmain.in
index fe9655c67d875f7db2d21cbeba4027bc83a6a889..84d9f6d06e70e6985e9e0fa06e672906c3ba12b7 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -90,13 +90,6 @@ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
   exit 1
 fi
 
-# A little paranoid perhaps...
-[ "${HOME+set}" ] || HOME=`cd && pwd`
-
-# Apparently some people optimistically hardcode `~' in their path, and
-# hope that their tools will interpret it correctly.  We mustn't disappoint!
-eval PATH=`echo "$PATH" | sed 's,^~/,$HOME/,;s,:~/,:$HOME/,g'`
-
 # Global variables.
 mode=$default_mode
 nonopt=
@@ -2068,7 +2061,7 @@ EOF
            IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"
-             $show "$cmd"
+             eval $show \""$cmd"\"
              $run eval "$cmd" || exit $?
            done
            IFS="$save_ifs"
@@ -2094,7 +2087,7 @@ EOF
        IFS="${IFS=     }"; save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
-         $show "$cmd"
+         eval $show \""$cmd"\"
          $run eval "$cmd" || exit $?
        done
        IFS="$save_ifs"
@@ -2171,7 +2164,7 @@ EOF
       IFS="${IFS=      }"; save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"
-       $show "$cmd"
+       eval $show \""$cmd"\"
        $run eval "$cmd" || exit $?
       done
       IFS="$save_ifs"
@@ -2195,7 +2188,7 @@ EOF
        IFS="${IFS=     }"; save_ifs="$IFS"; IFS='~'
        for cmd in $cmds; do
          IFS="$save_ifs"
-         $show "$cmd"
+         eval $show \""$cmd"\"
          $run eval "$cmd" || exit $?
        done
        IFS="$save_ifs"
@@ -2868,7 +2861,7 @@ fi\
       IFS="${IFS=      }"; save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"
-       $show "$cmd"
+       eval $show \""$cmd"\"
        $run eval "$cmd" || exit $?
       done
       IFS="$save_ifs"
@@ -3170,7 +3163,7 @@ libdir='$install_libdir'\
          IFS="${IFS=   }"; save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
-           $show "$cmd"
+           eval $show \""$cmd"\"
            $run eval "$cmd" || exit $?
          done
          IFS="$save_ifs"
@@ -3324,7 +3317,7 @@ libdir='$install_libdir'\
       IFS="${IFS=      }"; save_ifs="$IFS"; IFS='~'
       for cmd in $cmds; do
        IFS="$save_ifs"
-       $show "$cmd"
+       eval $show \""$cmd"\"
        $run eval "$cmd" || exit $?
       done
       IFS="$save_ifs"
@@ -3363,7 +3356,7 @@ libdir='$install_libdir'\
          IFS="${IFS=   }"; save_ifs="$IFS"; IFS='~'
          for cmd in $cmds; do
            IFS="$save_ifs"
-           $show "$cmd"
+           eval $show \""$cmd"\"
            $run eval "$cmd" || admincmds="$admincmds
        $cmd"
          done
@@ -3606,7 +3599,7 @@ libdir='$install_libdir'\
            IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"
-             $show "$cmd"
+             eval $show \""$cmd"\"
              $run eval "$cmd"
            done
            IFS="$save_ifs"
@@ -3618,7 +3611,7 @@ libdir='$install_libdir'\
            IFS="${IFS=         }"; save_ifs="$IFS"; IFS='~'
            for cmd in $cmds; do
              IFS="$save_ifs"
-             $show "$cmd"
+             eval $show \""$cmd"\"
              $run eval "$cmd"
            done
            IFS="$save_ifs"