maint.mk: update from coreutils

* maint.mk: Sync.
* cfg.mk (manual_title): Define.

2 files changed, 8 insertions, 3 deletions

diff --git a/cfg.mk b/cfg.mk
index 49b0f00..27deb15 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -24,6 +24,9 @@ gnu_rel_host = $(gnu_ftp_host-$(RELEASE_TYPE))
 url_dir_list = \
   ftp://$(gnu_rel_host)/gnu/coreutils
 
+# Used in maint.mk's web-manual rule
+manual_title = GNU idutils: ID database utilities
+
 # The GnuPG ID of the key used to sign the tarballs.
 gpg_key_ID = B9AB9A16
 
diff --git a/maint.mk b/maint.mk
index 60830e7..e740638 100644
--- a/maint.mk
+++ b/maint.mk
@@ -374,7 +374,7 @@ sc_the_the:
 
 sc_trailing_blank:
 	@re='[	 ]$$'							\
-	ignore_case=1 msg='found trailing blank(s)'			\
+	msg='found trailing blank(s)'					\
 	  $(_prohibit_regexp)
 
 # Match lines like the following, but where there is only one space
@@ -641,7 +641,7 @@ maintainer-distcheck:
 # Don't make a distribution if checks fail.
 # Also, make sure the NEWS file is up-to-date.
 vc-dist: $(local-check) cvs-check maintainer-distcheck
-	$(MAKE) dist
+	XZ_OPT=-9ev $(MAKE) dist
 
 # Use this to make sure we don't run these programs when building
 # from a virgin tgz file, below.
@@ -866,8 +866,10 @@ alpha beta major: $(local-check) writable-files
 
 .PHONY: web-manual
 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 -o '$(abs_builddir)/doc/manual' \
 	     --email $(PACKAGE_BUGREPORT) $(PACKAGE) \
-	    "$(PACKAGE_NAME) - Core GNU utilities"
+	    "$(PACKAGE_NAME) - $(manual_title)"
 	@echo " *** Upload the doc/manual directory to web-cvs."