summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkim Demaille <akim.demaille@gmail.com>2018-08-12 11:19:55 +0200
committerAkim Demaille <akim.demaille@gmail.com>2018-08-12 11:23:38 +0200
commitc8dc9a8f5135f4c7773fd93fd3b445bfd5dda604 (patch)
tree6c0a2da686c8d47b1175ebab13a0081b5cb5975b
parentf9a6b34147cefee501864ca7be301368336b7ea5 (diff)
downloadbison-c8dc9a8f5135f4c7773fd93fd3b445bfd5dda604.tar.gz
gnulib: update
* bootstrap.conf: gnulib_mk is defined again by bootstrap.
-rwxr-xr-xbootstrap21
-rw-r--r--bootstrap.conf2
m---------gnulib0
-rw-r--r--m4/.gitignore1
4 files changed, 13 insertions, 11 deletions
diff --git a/bootstrap b/bootstrap
index 002edf68..fa9d7c94 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,6 +1,6 @@
#! /bin/sh
# Print a version string.
-scriptversion=2018-05-27.20; # UTC
+scriptversion=2018-07-25.07; # UTC
# Bootstrap this package from checked-out sources.
@@ -142,6 +142,9 @@ die() { warn_ "$@"; exit 1; }
# Configuration.
+# Name of the Makefile.am
+gnulib_mk=gnulib.mk
+
# List of gnulib modules needed.
gnulib_modules=
@@ -165,7 +168,7 @@ bootstrap_epilogue() { :; }
# options because the latest/%s directory and the .po files within are
# all symlinks.
po_download_command_format=\
-"rsync --delete --exclude '*.s1' -Lrtvz \
+"rsync --include '*.po' --exclude '*' -Lrtvz \
'translationproject.org::tp/latest/%s/' '%s'"
# Fallback for downloading .po files (if rsync fails).
@@ -942,13 +945,13 @@ fi
if $use_gnulib; then
gnulib_tool_options="\
--no-changelog\
- --aux-dir $build_aux\
- --doc-base $doc_base\
- --lib $gnulib_name\
- --m4-base $m4_base/\
- --source-base $source_base/\
- --tests-base $tests_base\
- --local-dir $local_gl_dir\
+ --aux-dir=$build_aux\
+ --doc-base=$doc_base\
+ --lib=$gnulib_name\
+ --m4-base=$m4_base/\
+ --source-base=$source_base/\
+ --tests-base=$tests_base\
+ --local-dir=$local_gl_dir\
$gnulib_tool_option_extras\
"
if test $use_libtool = 1; then
diff --git a/bootstrap.conf b/bootstrap.conf
index 3e900b33..d8c7d128 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -81,7 +81,7 @@ gnulib_tool_option_extras='--symlink --makefile-name=gnulib.mk'
bootstrap_post_import_hook()
{
# Massage lib/gnulib.mk before using it later in the bootstrapping process.
- build-aux/prefix-gnulib-mk --lib-name=$gnulib_name lib/gnulib.mk
+ build-aux/prefix-gnulib-mk --lib-name="$gnulib_name" "lib/$gnulib_mk"
# Ensure that ChangeLog exists, for automake.
test -f ChangeLog || touch ChangeLog
diff --git a/gnulib b/gnulib
-Subproject 0d45ec7c033c165ad73a6509c7fa84aa67edf4e
+Subproject 8635df0ac89e4b1e77322126ecff67e6bca62bd
diff --git a/m4/.gitignore b/m4/.gitignore
index daace580..66cf8bbf 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -46,7 +46,6 @@
/gnulib-common.m4
/gnulib-comp.m4
/gnulib-tool.m4
-/hard-locale.m4
/iconv.m4
/include_next.m4
/intdiv0.m4