* bootstrap: Remove occurrences of .#bootmp from lib/Makefile.

diff --git a/ChangeLog b/ChangeLog
index 908dc8a05ca70c9220b7e06380e637de0e55adc7..b956d3794b1e5601371e42bea6be43d04ae56fe5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-19  Joel E. Denny  <jdenny@ces.clemson.edu>
+
+       * bootstrap: Remove occurrences of .#bootmp from lib/Makefile.
+
 2007-02-13  Juan Manuel Guerrero  <juan.guerrero@gmx.de>
 
        * djgpp/config.bat: Adjustments concerning the use of autoconf 2.61.

diff --git a/bootstrap b/bootstrap
index 33825b7adc032966e166857645cc13da055794aa..65a8584ed4de2042ff3126cdf943a17dba6ea6b1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -362,7 +362,10 @@ slurp() {
       done
       if test $file = Makefile.am; then
         copied=$copied${sep}gnulib.mk; sep=$nl
-       remove_intl='/^[^#].*\/intl/s/^/#/'
+       remove_intl='
+          /^[^#].*\/intl/s/^/#/
+          s,\.#bootmp/,,g
+        '
         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 &&

diff --git a/build-aux/.cvsignore b/build-aux/.cvsignore
index f7724115a099ef48e0508056c2fe98dbcc6b2892..23a5d983401e3cb7b24d77f50dcab640b03fb249 100644 (file)
--- a/build-aux/.cvsignore
+++ b/build-aux/.cvsignore
@@ -8,6 +8,7 @@ depcomp
 install-sh
 javacomp.sh.in
 javaexec.sh.in
+link-warning.h
 mdate-sh
 missing
 mkinstalldirs

diff --git a/lib/.cvsignore b/lib/.cvsignore
index c2c86105d9ca57260e512b9f3972420d68b3b70a..e2569e9c4b2386e5b36ad9426c5fdc21b9615093 100644 (file)
--- a/lib/.cvsignore
+++ b/lib/.cvsignore
@@ -50,6 +50,7 @@ stdint.h
 stdint_.h
 stdio--.h
 stdio-safer.h
+stdlib_.h
 stpcpy.c
 strerror.c
 string.h

diff --git a/m4/.cvsignore b/m4/.cvsignore
index ba11f3e6cc7f1a2e4bd0fd4b43de24e730b3bb82..44d0aab8d3ffa902aedeebc505d2960afac4e7c4 100644 (file)
--- a/m4/.cvsignore
+++ b/m4/.cvsignore
@@ -37,6 +37,7 @@ stdbool.m4
 stdint.m4
 stdint_h.m4
 stdio-safer.m4
+stdlib_h.m4
 stpcpy.m4
 strerror.m4
 string_h.m4