diff options
-rwxr-xr-x | bootstrap | 38 | ||||
-rw-r--r-- | po/.cvsignore | 2 |
2 files changed, 32 insertions, 8 deletions
@@ -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. diff --git a/po/.cvsignore b/po/.cvsignore index 8671e15..a2bf7a8 100644 --- a/po/.cvsignore +++ b/po/.cvsignore @@ -2,7 +2,7 @@ *.mo *.po .cvsignore -.references +.reference LINGUAS Makefile Makefile.in |