* gnulib-tool (func_add_or_update, func_create_testdir): Do not

simplify `sed_replace_build_aux' scripts, they are portable but
echoing them with `echo' is not.
Report and analysis by Fernando Ferreira <fernando.prog@netcabo.pt>.

diff --git a/ChangeLog b/ChangeLog
index 83b49e1a72289c9605dda065740993c08a9fa300..ae94a0b9993d75077760c68cb184b67a68a23d0d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * gnulib-tool (func_add_or_update, func_create_testdir): Do not
+       simplify `sed_replace_build_aux' scripts, they are portable but
+       echoing them with `echo' is not.
+       Report and analysis by Fernando Ferreira <fernando.prog@netcabo.pt>.
+
 2007-06-21  Karl Berry  <karl@gnu.org>
 
        * config/srclist.txt: guess we can't handle the licenses via

diff --git a/gnulib-tool b/gnulib-tool
index 72fa60eb669cfc21ead216a6fa27e600a5c2a807..5a13973748f31f066db734028957ff3804120d19 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2007-05-28 15:46:55 $'
+cvsdatestamp='$Date: 2007-06-22 18:16:40 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 nl='
@@ -2174,7 +2174,6 @@ func_import ()
           s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
           ba
         }'
-      sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
     else
       sed_replace_build_aux=
     fi
@@ -2623,7 +2622,6 @@ func_create_testdir ()
         s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:../'"$auxdir"'/\2)|
         ba
        }'
-     sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
      # We don't have explicit ordering constraints between the various
      # autoconf snippets. It's cleanest to put those of the library before
      # those of the tests.
@@ -2744,7 +2742,6 @@ func_create_testdir ()
          s|AC_CONFIG_FILES(\(.*\):build-aux/\(.*\))|AC_CONFIG_FILES(\1:'"$auxdir"'/\2)|
          ba
        }'
-     sed_replace_build_aux=`echo "$sed_replace_build_aux" | sed -e 1d -e 's/^ *//'`
    else
      sed_replace_build_aux=
    fi