mirror/libtool
2
0
Fork 0
mirror of git://git.savannah.gnu.org/libtool.git synced 2025-02-23 15:19:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

* config/ltmain.m4sh: Make sure that we $show what we will $run,

Browse Source 
use eval $show if we do $run eval.
This commit is contained in:
Peter O'Gorman 2004-10-13 14:55:59 +00:00
parent 9a2bd4eb89
commit 274b26c703
2 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-13 Peter O'Gorman <peter@pogma.com>
* config/ltmain.m4sh: Make sure that we $show what we will $run,
use eval $show if we do $run eval.
2004-10-13 Charles Wilson <spam.protected> 2004-10-13 Charles Wilson <spam.protected>
* config/ltmain.m4sh: add foo/bin for every foo/lib * config/ltmain.m4sh: add foo/bin for every foo/lib

58
config/ltmain.m4sh
View File

@ -1276,7 +1276,7 @@ EOF
$run $RM "$lobj" "$output_obj" $run $RM "$lobj" "$output_obj"
$show "$command" eval $show "$command"
if $run eval "$command"; then : if $run eval "$command"; then :
else else
test -n "$output_obj" && $run $RM $removelist test -n "$output_obj" && $run $RM $removelist
@ -1348,7 +1348,7 @@ EOF
# Suppress compiler output if we already did a PIC compilation. # Suppress compiler output if we already did a PIC compilation.
command="$command$suppress_output" command="$command$suppress_output"
$run $RM "$obj" "$output_obj" $run $RM "$obj" "$output_obj"
$show "$command" eval $show "$command"
if $run eval "$command"; then : if $run eval "$command"; then :
else else
$run $RM $removelist $run $RM $removelist
@ -1563,7 +1563,7 @@ func_mode_finish ()
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || admincmds="$admincmds $run eval "$cmd" || admincmds="$admincmds
$cmd" $cmd"
done done
@ -1804,7 +1804,7 @@ func_mode_install ()
fi fi
func_warning "relinking \`$file'" func_warning "relinking \`$file'"
$show "$relink_command" eval $show "$relink_command"
$run eval "$relink_command" || \ $run eval "$relink_command" || \
func_fatal_error "error: relink \`$file' with the above command before installing it" func_fatal_error "error: relink \`$file' with the above command before installing it"
fi fi
@ -1820,10 +1820,10 @@ func_mode_install ()
test -n "$relink_command" && srcname="$realname"T test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks. # Install the shared library and build the symlinks.
$show "$install_prog $dir/$srcname $destdir/$realname" eval $show "$install_prog $dir/$srcname $destdir/$realname"
$run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
if test -n "$stripme" && test -n "$striplib"; then if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname" eval $show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $? $run eval "$striplib $destdir/$realname" || exit $?
fi fi
@ -1832,7 +1832,7 @@ func_mode_install ()
for linkname for linkname
do do
if test "$linkname" != "$realname"; then if test "$linkname" != "$realname"; then
$show "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)" eval $show "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)"
$run eval "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)" $run eval "(cd $destdir && $RM $linkname && $LN_S $realname $linkname)"
fi fi
done done
@ -1845,7 +1845,7 @@ func_mode_install ()
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
done done
IFS="$save_ifs" IFS="$save_ifs"
@ -1854,7 +1854,7 @@ func_mode_install ()
# Install the pseudo-library for information purposes. # Install the pseudo-library for information purposes.
name=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'` name=`$ECHO "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name" eval $show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $? $run eval "$install_prog $instname $destdir/$name" || exit $?
# Maybe install the static library, too. # Maybe install the static library, too.
@ -1888,7 +1888,7 @@ func_mode_install ()
# Install the libtool object if requested. # Install the libtool object if requested.
if test -n "$destfile"; then if test -n "$destfile"; then
$show "$install_prog $file $destfile" eval $show "$install_prog $file $destfile"
$run eval "$install_prog $file $destfile" || exit $? $run eval "$install_prog $file $destfile" || exit $?
fi fi
@ -1897,7 +1897,7 @@ func_mode_install ()
# Deduce the name of the old-style object file. # Deduce the name of the old-style object file.
staticobj=`$ECHO "X$file" | $Xsed -e "$lo2o"` staticobj=`$ECHO "X$file" | $Xsed -e "$lo2o"`
$show "$install_prog $staticobj $staticdest" eval $show "$install_prog $staticobj $staticdest"
$run eval "$install_prog \$staticobj \$staticdest" || exit $? $run eval "$install_prog \$staticobj \$staticdest" || exit $?
fi fi
exit $EXIT_SUCCESS exit $EXIT_SUCCESS
@ -1996,7 +1996,7 @@ func_mode_install ()
# Replace the output file specification. # Replace the output file specification.
relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
$show "$relink_command" eval $show "$relink_command"
if $run eval "$relink_command"; then : if $run eval "$relink_command"; then :
else else
func_error "error: relink \`$file' with the above command before installing it" func_error "error: relink \`$file' with the above command before installing it"
@ -2030,7 +2030,7 @@ func_mode_install ()
esac esac
;; ;;
esac esac
$show "$install_prog$stripme $file $destfile" eval $show "$install_prog$stripme $file $destfile"
$run eval "$install_prog\$stripme \$file \$destfile" || exit $? $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
test -n "$outputname" && ${RM}r "$tmpdir" test -n "$outputname" && ${RM}r "$tmpdir"
;; ;;
@ -2043,11 +2043,11 @@ func_mode_install ()
# Set up the ranlib parameters. # Set up the ranlib parameters.
oldlib="$destdir/$name" oldlib="$destdir/$name"
$show "$install_prog $file $oldlib" eval $show "$install_prog $file $oldlib"
$run eval "$install_prog \$file \$oldlib" || exit $? $run eval "$install_prog \$file \$oldlib" || exit $?
if test -n "$stripme" && test -n "$old_striplib"; then if test -n "$stripme" && test -n "$old_striplib"; then
$show "$old_striplib $oldlib" eval $show "$old_striplib $oldlib"
$run eval "$old_striplib $oldlib" || exit $? $run eval "$old_striplib $oldlib" || exit $?
fi fi
@ -2057,7 +2057,7 @@ func_mode_install ()
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
done done
IFS="$save_ifs" IFS="$save_ifs"
@ -3640,7 +3640,7 @@ func_mode_link ()
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
done done
IFS="$save_ifs" IFS="$save_ifs"
@ -3654,7 +3654,7 @@ func_mode_link ()
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
done done
IFS="$save_ifs" IFS="$save_ifs"
@ -4901,7 +4901,7 @@ EOF
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
if len=`expr "X$cmd" : ".*"` && if len=`expr "X$cmd" : ".*"` &&
test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
skipped_export=false skipped_export=false
else else
@ -5077,7 +5077,7 @@ EOF
save_ifs="$IFS"; IFS='~' save_ifs="$IFS"; IFS='~'
for cmd in $concat_cmds; do for cmd in $concat_cmds; do
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || { $run eval "$cmd" || {
lt_exit=$? lt_exit=$?
@ -5135,7 +5135,7 @@ EOF
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || { $run eval "$cmd" || {
lt_exit=$? lt_exit=$?
@ -5247,7 +5247,7 @@ EOF
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
done done
IFS="$save_ifs" IFS="$save_ifs"
@ -5284,7 +5284,7 @@ EOF
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
done done
IFS="$save_ifs" IFS="$save_ifs"
@ -5468,7 +5468,7 @@ EOF
link_command="$compile_command$compile_rpath" link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now. # We have no uninstalled library dependencies, so finalize right now.
$show "$link_command" eval $show "$link_command"
$run eval "$link_command" $run eval "$link_command"
status=$? status=$?
@ -5535,7 +5535,7 @@ EOF
# Delete the old output file. # Delete the old output file.
$run $RM $output $run $RM $output
# Link the executable and exit # Link the executable and exit
$show "$link_command" eval $show "$link_command"
$run eval "$link_command" || exit $? $run eval "$link_command" || exit $?
exit $EXIT_SUCCESS exit $EXIT_SUCCESS
fi fi
@ -5568,7 +5568,7 @@ EOF
# Delete the old output files. # Delete the old output files.
$run $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname $run $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
$show "$link_command" eval $show "$link_command"
$run eval "$link_command" || exit $? $run eval "$link_command" || exit $?
# Now create the wrapper script. # Now create the wrapper script.
@ -6248,7 +6248,7 @@ fi\
for cmd in $cmds; do for cmd in $cmds; do
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
IFS="$save_ifs" IFS="$save_ifs"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" || exit $? $run eval "$cmd" || exit $?
done done
IFS="$save_ifs" IFS="$save_ifs"
@ -6505,7 +6505,7 @@ func_mode_uninstall ()
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" $run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then if test "$?" -ne 0 && test "$rmforce" != yes; then
exit_status=1 exit_status=1
@ -6521,7 +6521,7 @@ func_mode_uninstall ()
for cmd in $cmds; do for cmd in $cmds; do
IFS="$save_ifs" IFS="$save_ifs"
eval cmd=\"$cmd\" eval cmd=\"$cmd\"
$show "$cmd" eval $show "$cmd"
$run eval "$cmd" $run eval "$cmd"
if test "$?" -ne 0 && test "$rmforce" != yes; then if test "$?" -ne 0 && test "$rmforce" != yes; then
exit_status=1 exit_status=1