diff options
-rwxr-xr-x | build-aux/bootstrap | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/build-aux/bootstrap b/build-aux/bootstrap index d4f223d..d025457 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap | |||
@@ -45,13 +45,13 @@ usage() { | |||
45 | 45 | ||
46 | The following two options are reserved for future use: | 46 | The following two options are reserved for future use: |
47 | 47 | ||
48 | --no-po Do not download po files. | 48 | --no-po Do not download po files. |
49 | --update-po[=LANG] Update po file(s) and exit. | 49 | --update-po[=LANG] Update po file(s) and exit. |
50 | 50 | ||
51 | If the file `.bootstrap' exists in the current working directory, its | 51 | If the file \`.bootstrap' exists in the current working directory, its |
52 | contents is read, comments and empty lines removed, shell variables expanded | 52 | contents is read, comments and empty lines removed, shell variables expanded |
53 | and the result is prepended to the command line options. | 53 | and the result is prepended to the command line options. |
54 | 54 | ||
55 | Running without arguments will suffice in most cases. It is equivalent | 55 | Running without arguments will suffice in most cases. It is equivalent |
56 | to | 56 | to |
57 | 57 | ||
@@ -236,13 +236,13 @@ for gnulib_file in $gnulib_files; do | |||
236 | case $gnulib_file in | 236 | case $gnulib_file in |
237 | config/*) dest=`echo $gnulib_file | sed 's,config/,build-aux/,'`;; | 237 | config/*) dest=`echo $gnulib_file | sed 's,config/,build-aux/,'`;; |
238 | # These will be overwritten by autopoint, which still uses | 238 | # These will be overwritten by autopoint, which still uses |
239 | # old jm_.* macro names, so we have to keep both copies. | 239 | # old jm_.* macro names, so we have to keep both copies. |
240 | m4/gettext.m4 | m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \ | 240 | m4/gettext.m4 | m4/glibc21.m4 | m4/inttypes_h.m4 | m4/lib-ld.m4 | \ |
241 | m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \ | 241 | m4/lib-prefix.m4 | m4/po.m4 | m4/stdint_h.m4 | m4/uintmax_t.m4 | \ |
242 | m4/ulonglong.m4) | 242 | m4/ulonglong.m4 | m4/longlong.m4) |
243 | dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;; | 243 | dest=`expr $gnulib_file : '\(.*\).m4'`_gl.m4;; |
244 | *) dest=$gnulib_file;; | 244 | *) dest=$gnulib_file;; |
245 | esac | 245 | esac |
246 | rm -f $dest && | 246 | rm -f $dest && |
247 | echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" && | 247 | echo "$0: Copying file $GNULIB_SRCDIR/$gnulib_file" && |
248 | cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit | 248 | cp -p $GNULIB_SRCDIR/$gnulib_file $dest || exit |
@@ -256,13 +256,14 @@ echo "$0: Creating m4/gnulib.m4" | |||
256 | echo "# $gnulib_module" | 256 | echo "# $gnulib_module" |
257 | $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module | 257 | $GNULIB_SRCDIR/gnulib-tool --extract-autoconf-snippet $gnulib_module |
258 | done | sed '/AM_GNU_GETTEXT/d' | 258 | done | sed '/AM_GNU_GETTEXT/d' |
259 | echo "])") > ./m4/gnulib.m4 | 259 | echo "])") > ./m4/gnulib.m4 |
260 | 260 | ||
261 | echo "$0: Creating lib/Makefile.am" | 261 | echo "$0: Creating lib/Makefile.am" |
262 | (echo "# This file is generated automatically from lib/Makefile.am. Do not edit!" | 262 | (echo "# -*- buffer-read-only: t -*- vi: set ro:" |
263 | echo "# This file is generated automatically from lib/Makefile.tmpl. Do not edit!" | ||
263 | cat lib/Makefile.tmpl | 264 | cat lib/Makefile.tmpl |
264 | 265 | ||
265 | for gnulib_module in $gnulib_modules; do | 266 | for gnulib_module in $gnulib_modules; do |
266 | echo "# $gnulib_module" | 267 | echo "# $gnulib_module" |
267 | $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module | 268 | $GNULIB_SRCDIR/gnulib-tool --extract-automake-snippet $gnulib_module |
268 | done | sed 's/lib_SOURCES/libcflow_a_SOURCES/g' ) > lib/Makefile.am | 269 | done | sed 's/lib_SOURCES/libcflow_a_SOURCES/g' ) > lib/Makefile.am |