aboutsummaryrefslogtreecommitdiff
path: root/bootstrap
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2008-03-06 09:45:55 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2008-03-06 09:45:55 +0000
commit564cd6c6aca631979eda1f512ea53130c3acc9c2 (patch)
treedaf127c50b7f0942fe704f1f4046688f45ba38bf /bootstrap
parent8d09d840ffb78fcb3a94f61644a0c28f33c19240 (diff)
downloadcpio-564cd6c6aca631979eda1f512ea53130c3acc9c2.tar.gz
cpio-564cd6c6aca631979eda1f512ea53130c3acc9c2.tar.bz2
* bootstrap: Update .cvsignore files.
* po/.cvsignore: Update.
Diffstat (limited to 'bootstrap')
-rwxr-xr-xbootstrap38
1 files changed, 31 insertions, 7 deletions
diff --git a/bootstrap b/bootstrap
index 48552f8..a48ce60 100755
--- a/bootstrap
+++ b/bootstrap
@@ -305,14 +305,29 @@ trap 'cleanup_ifl' 1 2 3 15
# ignorefile DIR FILE
# add FILE to the temporary ignorelist in the directory DIR
ignorefile() {
- file=$1/.ignore.$$
- echo "$2" >> $file
- if `echo $ignore_list | grep -qv $file`; then
- ignore_file_list="$ignore_file_list
+ file=$1/.ignore.$$
+ shift
+ for f in $*
+ do
+ echo "$f" >> $file
+ if `echo $ignore_list | grep -qv $file`; then
+ ignore_file_list="$ignore_file_list
$file"
- fi
+ fi
+ done
}
+flush_cvsignore() {
+ dir=$1
+ shift
+ (test -r $dir/.ignore.$$ && cat $dir/.ignore.$$
+ test -r $dir/.cvsignore && cat $dir/.cvsignore
+ for file in $*
+ do
+ echo $file
+ done) | sort -u > $dir/.cvsignore.$$ && mv $dir/.cvsignore.$$ $dir/.cvsignore
+}
+
# copy_files srcdir dstdir
copy_files() {
for file in `cat $1/DISTFILES`
@@ -580,7 +595,7 @@ echo "$0: Creating m4/paxutils.m4"
echo "AC_DEFUN([${package}_PAXUTILS],["
cat ${PAXUTILS_SRCDIR}/m4/DISTFILES | sed '/^#/d;s/\(.*\)\.m4/pu_\1/' | tr a-z A-Z
echo "])") > ./m4/paxutils.m4
-ignorefile m4 paxutils.m4
+update_cvsignore m4 paxutils.m4
if [ -d rmt ]; then
:
@@ -597,10 +612,19 @@ copy_files ${PAXUTILS_SRCDIR}/paxlib lib pax
echo "$0: Creating lib/system.c"
m4 -DMODE=C sysdep.m4 mingw.m4 > lib/system.c
-echo "$0: Updating lib/system.h"
+echo "$0: Creating lib/system.h"
m4 -DMODE=H sysdep.m4 mingw.m4 >> lib/system.h
+ignorefile lib system.c system.h
echo "$0: Creating m4/sysdep.m4"
m4 -DMODE=AC sysdep.m4 mingw.m4 > m4/sysdep.m4
+ignorefile m4 sysdep.m4
+
+echo "$0: Flushing .cvsignore files"
+ignorefile lib .cvsignore .deps
+for dir in m4 lib
+do
+ flush_cvsignore $dir
+done
# Reconfigure, getting other files.

Return to:

Send suggestions and report system problems to the System administrator.