Mercurial > hg > octave-nkf > gnulib-hg
changeset 13780:dcbf0852769a
bootstrap: reformat for readability
* build-aux/bootstrap: Rewrite to avoid lines longer than 80 columns.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 08 Oct 2010 09:59:40 -0700 |
parents | cd2361a2183f |
children | e9b975e48d33 |
files | ChangeLog build-aux/bootstrap |
diffstat | 2 files changed, 19 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-08 Paul Eggert <eggert@cs.ucla.edu> + + bootstrap: reformat for readability + * build-aux/bootstrap: Rewrite to avoid lines longer than 80 columns. + 2010-10-08 Eric Blake <eblake@redhat.com> docs: update cygwin progress
--- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2010-10-05.15; # UTC +scriptversion=2010-10-08.16; # UTC # Bootstrap this package from checked-out sources. @@ -394,7 +394,7 @@ if ! printf "$buildreq" | check_versions; then echo >&2 if test -f README-prereq; then - echo "See README-prereq for notes on obtaining the prerequisite programs" >&2 + echo "See README-prereq for how to get the prerequisite programs" >&2 else echo "Please install the prerequisite programs" >&2 fi @@ -678,7 +678,8 @@ for file in `ls -a $1/$dir`; do case $file in .|..) continue;; - .*) continue;; # FIXME: should all file names starting with "." be ignored? + # FIXME: should all file names starting with "." be ignored? + .*) continue;; esac test -d $1/$dir/$file && continue for excluded_file in $excluded_files; do @@ -687,7 +688,8 @@ if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then copied=$copied${sep}$gnulib_mk; sep=$nl remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g" - sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null || { + sed "$remove_intl" $1/$dir/$file | + cmp - $dir/$gnulib_mk > /dev/null || { echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." && rm -f $dir/$gnulib_mk && sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk @@ -723,7 +725,14 @@ # the name with just ".h". Many gnulib headers are generated, # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc. # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed - f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'` + f=`echo "$copied" | + sed ' + s/\.in\.h$/.h/ + s/\.sin$/.sed/ + s/\.y$/.c/ + s/\.gperf$/.h/ + ' + ` insert_sorted_if_absent $ig "$f" # For files like sys_stat.in.h and sys_time.in.h, record as