Applied as obvious, to collect some bug fixes and move one of our local gnulib patches upstream where it belongs.
Among others, this fixes a bug in _build-aux expansion so that `make syntax-check' works again. * gnulib: Updated to todays master HEAD revision. * gl/top/maint.mk.diff: Remove. This patch has been applied upstream already. Signed-off-by: Gary V. Vaughan <g...@gnu.org> --- gl/top/maint.mk.diff | 68 -------------------------------------------------- gnulib | 2 +- 2 files changed, 1 insertions(+), 69 deletions(-) delete mode 100644 gl/top/maint.mk.diff diff --git a/gl/top/maint.mk.diff b/gl/top/maint.mk.diff deleted file mode 100644 index 3edd298..0000000 --- a/gl/top/maint.mk.diff +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/top/maint.mk b/top/maint.mk -index d51fec6..f6ad4f0 100644 ---- a/top/maint.mk -+++ b/top/maint.mk -@@ -21,9 +21,6 @@ - # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)) - ME := maint.mk - --# Override this in cfg.mk if you use a non-standard build-aux directory. --build_aux ?= $(srcdir)/build-aux -- - # Do not save the original name or timestamp in the .tar.gz file. - # Use --rsyncable if available. - gzip_rsyncable := \ -@@ -34,7 +31,7 @@ GZIP_ENV = '--no-name --best $(gzip_rsyncable)' - GIT = git - VC = $(GIT) - --VC_LIST = $(build_aux)/vc-list-files -C $(srcdir) -+VC_LIST = $(srcdir)/$(_build-aux)/vc-list-files -C $(srcdir) - - # You can override this variable in cfg.mk to set your own regexp - # matching files to ignore. -@@ -274,7 +271,7 @@ define _sc_search_regexp - endef - - sc_avoid_if_before_free: -- @$(build_aux)/useless-if-before-free \ -+ @$(srcdir)/$(_build-aux)/useless-if-before-free \ - $(useless_free_options) \ - $$($(VC_LIST_EXCEPT) | grep -v useless-if-before-free) && \ - { echo '$(ME): found useless "if" before "free" above' 1>&2; \ -@@ -1208,7 +1205,7 @@ else - endif - - announcement: NEWS ChangeLog $(rel-files) -- @$(build_aux)/announce-gen \ -+ @$(srcdir)/$(_build-aux)/announce-gen \ - --mail-headers='$(announcement_mail_headers_)' \ - --release-type=$(RELEASE_TYPE) \ - --package=$(PACKAGE) \ -@@ -1232,7 +1229,7 @@ upload_dest_dir_ ?= $(PACKAGE) - emit_upload_commands: - @echo ===================================== - @echo ===================================== -- @echo "$(build_aux)/gnupload $(GNUPLOADFLAGS) \\" -+ @echo "$(srcdir)/$(_build-aux)/gnupload $(GNUPLOADFLAGS) \\" - @echo " --to $(gnu_rel_host):$(upload_dest_dir_) \\" - @echo " $(rel-files)" - @echo '# send the ~/announce-$(my_distdir) e-mail' -@@ -1327,7 +1324,7 @@ web-manual: - @test -z "$(manual_title)" \ - && { echo define manual_title in cfg.mk 1>&2; exit 1; } || : - @cd '$(srcdir)/doc'; \ -- $(SHELL) ../$(build_aux)/gendocs.sh $(gendocs_options_) \ -+ $(SHELL) ../$(_build-aux)/gendocs.sh $(gendocs_options_) \ - -o '$(abs_builddir)/doc/manual' \ - --email $(PACKAGE_BUGREPORT) $(PACKAGE) \ - "$(PACKAGE_NAME) - $(manual_title)" -@@ -1392,7 +1389,7 @@ update-copyright-env ?= - update-copyright: - grep -l -w Copyright \ - $$(export VC_LIST_EXCEPT_DEFAULT=COPYING && $(VC_LIST_EXCEPT)) \ -- | $(update-copyright-env) xargs $(build_aux)/$@ -+ | $(update-copyright-env) xargs $(srcdir)/$(_build-aux)/$@ - - # This tight_scope test is skipped with a warning if $(_gl_TS_headers) is not - # overridden and $(_gl_TS_dir)/Makefile.am does not mention noinst_HEADERS. diff --git a/gnulib b/gnulib index 356e374..fb6de05 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 356e3744fbe79b23e608b8f4ec1b8204986b8f8e +Subproject commit fb6de052bace5b26346c1624b57d87326a97c7b6 -- 1.7.7.3