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

[bison.git] / bootstrap

diff --git a/bootstrap b/bootstrap
index 238873e3e20447b878169e33692aea0715474bb4..65a8584ed4de2042ff3126cdf943a17dba6ea6b1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # Bootstrap this package from CVS.
 
 
 # Bootstrap this package from CVS.
 

-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by


@@ -87,6 +87,7 @@ package=`sed -n "$extract_package_name" configure.ac` || exit
 
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files='
 
 # Extra files from gnulib, which override files from other sources.
 gnulib_extra_files='

+       build-aux/announce-gen

        build-aux/install-sh
        build-aux/missing
        build-aux/mdate-sh
        build-aux/install-sh
        build-aux/missing
        build-aux/mdate-sh


@@ -314,7 +315,7 @@ cp_mark_as_generated()
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {
        echo "$0: cp -f $cp_src $cp_dst" &&
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {
        echo "$0: cp -f $cp_src $cp_dst" &&

-       cp -f "$cp_src" "$cp_dst"
+       sed 's/\.#bootmp\///g' "$cp_src" > "$cp_dst"

       }
     else
       # Copy the file first to get proper permissions if it
       }
     else
       # Copy the file first to get proper permissions if it


@@ -323,7 +324,7 @@ cp_mark_as_generated()
       (
        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&
       (
        echo "$c1-*- buffer-read-only: t -*- vi: set ro:$c2" &&
        echo "${c1}DO NOT EDIT! GENERATED AUTOMATICALLY!$c2" &&

-       cat "$cp_src"
+       sed 's/\.#bootmp\///g' "$cp_src"

       ) > $cp_dst-t &&
       if cmp -s "$cp_dst-t" "$cp_dst"; then
        rm -f "$cp_dst-t"
       ) > $cp_dst-t &&
       if cmp -s "$cp_dst-t" "$cp_dst"; then
        rm -f "$cp_dst-t"


@@ -361,7 +362,10 @@ slurp() {
       done
       if test $file = Makefile.am; then
         copied=$copied${sep}gnulib.mk; sep=$nl
       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 &&
         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 &&


@@ -389,11 +393,13 @@ slurp() {
       fi || exit
     done
 
       fi || exit
     done
 

-    ig=$dir/.cvsignore
-    if test -n "$copied" && test -f $ig; then
-      echo "$copied" | sort -u - $ig | cmp -s - $ig ||
-      echo "$copied" | sort -u - $ig -o $ig || exit
-    fi
+    for dot_ig in .cvsignore .gitignore; do
+      ig=$dir/$dot_ig
+      if test -n "$copied" && test -f $ig; then
+       echo "$copied" | sort -u - $ig | cmp -s - $ig ||
+       echo "$copied" | sort -u - $ig -o $ig || exit
+      fi
+    done

   done
 }
 
   done
 }