improve code for sysroot --mode=finish

* libltdl/config/ltmain.m4sh (func_mode_finish): Change sysroot_regex
and sysroot_cmd delimiter from pipe to slash.  Wrap the entire for
loop with "if $opt_dry_run...fi" and print an explanatory message
for the --dry-run case.

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index d29fd5d81f11e7de59a71ff081e13a0676d704d5..4e922acd5b491549837e377541ebc9c88ede0cf9 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -1419,24 +1419,27 @@ func_mode_finish ()
     done
 
     if test -n "$libs"; then
-      tmpdir=`func_mktempdir`
       if test -n "$lt_sysroot"; then
-        sysroot_regex=`$ECHO "$lt_sysroot" | $SED 's/[].[^$\\*|]/\\\\&/g'`
-        sysroot_cmd="s|\([ ']\)$sysroot_regex|\1|g;"
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED 's/[].[^$\\*/]/\\\\&/g'`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
       else
         sysroot_cmd=
       fi
 
       # Remove sysroot references
-      for lib in $libs; do
-       $opt_dry_run || {
+      if $opt_dry_run; then
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
          sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
            > $tmpdir/tmp-la
          mv -f $tmpdir/tmp-la $lib
-       }
-       file="$outputname"
-      done
-      $opt_dry_run || ${RM}r "$tmpdir"
+       done
+        ${RM}r "$tmpdir"
+      else
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      fi
     fi
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then