[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bootstrap fix for better .cvsignore
From: |
Paul Eggert |
Subject: |
bootstrap fix for better .cvsignore |
Date: |
Tue, 22 Aug 2006 12:20:41 -0700 |
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (gnu/linux) |
I installed this:
2006-08-22 Paul Eggert <address@hidden>
* bootstrap (bootstrap_conf_cleanup): Remove.
(excluded_files): New var.
* bootstrap.conf: Likewise.
* bootstrap (slurp): Exclude files early if they're in the
excluded_files list. That way, their names don't get put into
.cvsignore.
Index: bootstrap
===================================================================
RCS file: /fetish/cu/bootstrap,v
retrieving revision 1.1
diff -p -u -r1.1 bootstrap
--- bootstrap 21 Aug 2006 07:30:45 -0000 1.1
+++ bootstrap 22 Aug 2006 19:17:42 -0000
@@ -83,8 +83,8 @@ XGETTEXT_OPTIONS='\\\
--flag=error:3:c-format --flag=error_at_line:5:c-format\\\
'
-# Clean up after getting gnulib and gettext files.
-bootstrap_conf_cleanup() { :; }
+# Files we don't want to import.
+excluded_files=
# Override the default configuration, if necessary.
test -r bootstrap.conf && . ./bootstrap.conf
@@ -214,6 +214,9 @@ slurp() {
sep=
for file in `ls $1/$dir`; do
test -d $1/$dir/$file && continue
+ for excluded_file in $excluded_files; do
+ test "$dir/$file" = "$excluded_file" && continue 2
+ done
if test $file = Makefile.am; then
copied=$copied${sep}gnulib.mk; sep=$nl
echo "$0: Copying $1/$dir/$file to $dir/gnulib.mk ..." &&
@@ -282,8 +285,6 @@ slurp $bt2 $bt || exit
rm -fr $bt $bt2 || exit
-bootstrap_conf_cleanup || exit
-
# Reconfigure, getting other files.
Index: bootstrap.conf
===================================================================
RCS file: /fetish/cu/bootstrap.conf,v
retrieving revision 1.1
diff -p -u -r1.1 bootstrap.conf
--- bootstrap.conf 21 Aug 2006 07:30:45 -0000 1.1
+++ bootstrap.conf 22 Aug 2006 19:17:42 -0000
@@ -73,12 +73,9 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
--flag=wrapf:1:c-format\\\
'
-# Clean up after getting gnulib and gettext files.
-bootstrap_conf_cleanup() {
-
- # Gettext supplies these files, but we don't need them since
- # we don't have an intl subdirectory.
- files_to_remove='
+# Gettext supplies these files, but we don't need them since
+# we don't have an intl subdirectory.
+excluded_files='
m4/glibc2.m4
m4/intdiv0.m4
m4/inttypes-h.m4
@@ -91,7 +88,4 @@ bootstrap_conf_cleanup() {
m4/ulonglong.m4
m4/visibility.m4
m4/xsize.m4
- '
- echo $0: rm -f $files_to_remove &&
- rm -f $files_to_remove
-}
+'
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- bootstrap fix for better .cvsignore,
Paul Eggert <=