* bootstrap: Undo last change to this file, since now gnulib-tool

sticks with the automake default in generating dependencies.

diff --git a/ChangeLog b/ChangeLog
index 7104ccbed02497233e2a847f708c2db1abd04deb..f82bf80eec3072ca05dc493c6d2ec7b5bc3efe39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-02  Jim Meyering  <jim@meyering.net>
+
+       * bootstrap: Undo last change to this file, since now gnulib-tool
+       sticks with the automake default in generating dependencies.
+
 2006-09-30  Jim Meyering  <jim@meyering.net>
 
        Version 6.3.

diff --git a/bootstrap b/bootstrap
index a9124017ad247b39955d2dc5e9a712fcf7c70675..93cfd623cfbed16e84a0ed2a501a6c7098c5f106 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -326,13 +326,10 @@ slurp() {
       if test $file = Makefile.am; then
         copied=$copied${sep}gnulib.mk; sep=$nl
        remove_intl='/^[^#].*\/intl/s/^/#/'
-       no_dep=no-dependencies
-       remove_no_dep="/^AUTOMAKE_OPTIONS =.* $no_dep/s/ $no_dep//"
-       sed_xform="$remove_intl;$remove_no_dep"
-        sed "$sed_xform" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
+        sed "$remove_intl" $1/$dir/$file | cmp -s - $dir/gnulib.mk || {
          echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
          rm -f $dir/gnulib.mk &&
-         sed "$sed_xform" $1/$dir/$file >$dir/gnulib.mk
+         sed "$remove_intl" $1/$dir/$file >$dir/gnulib.mk
        }
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
           grep -F "/$file/" $dir/CVS/Entries 2>/dev/null |