diff options
| author | Jim Meyering <meyering@fb.com> | 2013-07-29 02:20:43 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2013-08-10 15:41:45 -0700 |
| commit | 996aa6ac3589547f539c89bba0ffda6a2cdbcf6b (patch) | |
| tree | 93a507598119d7bfb7ab01674bda171913ac6bee /bootstrap.conf | |
| parent | 94acf00027bda73423197e371ac9185c7246deec (diff) | |
| download | grep-996aa6ac3589547f539c89bba0ffda6a2cdbcf6b.tar.gz | |
build: update gnulib-related code
* gnulib: Update submodule to latest.
* bootstrap: Update from gnulib.
* gl/lib/regex_internal.h.diff: Update to reflect gnulib changes.
* bootstrap.conf: Partial sync from coreutils.
Diffstat (limited to 'bootstrap.conf')
| -rw-r--r-- | bootstrap.conf | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/bootstrap.conf b/bootstrap.conf index 1fb757b9..ff61fd64 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -98,16 +98,16 @@ MSGID_BUGS_ADDRESS=bug-grep@gnu.org # Additional xgettext options to use. Use "\\\newline" to break lines. XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\ - --from-code=UTF-8\\\ - --flag=asprintf:2:c-format --flag=vasprintf:2:c-format\\\ - --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\ + --flag=asnprintf:3:c-format\\\ + --flag=asprintf:2:c-format\\\ + --flag=error:3:c-format\\\ + --flag=error_at_line:5:c-format\\\ + --flag=vasnprintf:3:c-format\\\ + --flag=vasprintf:2:c-format\\\ --flag=wrapf:1:c-format\\\ - --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ + --from-code=UTF-8\\\ ' -# Automake requires that ChangeLog exist. -test -f ChangeLog || touch ChangeLog || exit 1 - gnulib_tool_option_extras="--tests-base=gnulib-tests --with-tests --symlink\ --makefile-name=gnulib.mk $avoided_gnulib_modules @@ -126,6 +126,12 @@ rsync - tar - " +bootstrap_post_import_hook () +{ + # Automake requires that ChangeLog exist. + touch ChangeLog || return 1 +} + bootstrap_epilogue() { perl -pi -e "s/\@PACKAGE\@/$package/g" README-release @@ -138,6 +144,6 @@ bootstrap_epilogue() # Why? That pipeline searches all files in $(top_srcdir), and if you # happen to have large files (or apparently large sparse files), the # first grep may well run out of memory. - perl -pi -e 's/ LC_ALL=C grep .GNU .PACKAGE.*; then/ true; then/' \ + perl -pi -e 's/if LC_ALL=C grep .GNU .PACKAGE.*; then/if true; then/' \ po/Makefile.in.in } |