maint: accommodate gnulib's newer tight_scope rule

* cfg.mk: Include via "-include", to accommodate new tight-scope rule.
(sc_check-AUTHORS): Change the name of the rule in src/Makefile.am
to _sc_check-AUTHORS, so it doesn't conflict with this one when
this file is included into the sub-make's context.
* src/Makefile.am (_sc_check-AUTHORS): Rename from sc_check-AUTHORS.
* gnulib: Update to latest.

diff --git a/cfg.mk b/cfg.mk
index c7515c731a2f2db0bbced8e0876011886c9b30a1..1d0fba108223a7a8e97b668500129186529e28b5 100644 (file)
--- a/cfg.mk
+++ b/cfg.mk
@@ -130,7 +130,7 @@ sc_sun_os_names:
 
 ALL_RECURSIVE_TARGETS += sc_check-AUTHORS
 sc_check-AUTHORS:
-       @$(MAKE) -s -C src $@
+       @$(MAKE) -s -C src _sc_check-AUTHORS
 
 # Look for lines longer than 80 characters, except omit:
 # - program-generated long lines in diff headers,
@@ -330,7 +330,7 @@ sc_prohibit_strncmp:
 announcement_Cc_ = $(translation_project_), \
   coreutils@gnu.org, coreutils-announce@gnu.org
 
-include $(srcdir)/dist-check.mk
+-include $(srcdir)/dist-check.mk
 
 update-copyright-env = \
   UPDATE_COPYRIGHT_USE_INTERVALS=1 \

diff --git a/gnulib b/gnulib
index 4104cd4f7746f8ba7e75e3292c78c2c528b0c88a..9d196fad055a448c5732a8e950cc044b353d2615 160000 (submodule)
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit 4104cd4f7746f8ba7e75e3292c78c2c528b0c88a
+Subproject commit 9d196fad055a448c5732a8e950cc044b353d2615

diff --git a/src/Makefile.am b/src/Makefile.am
index 6083b396e753797630add1656c46deed0c742298..908cd332dfce1f31018122e24ec56c56fc4b6dec 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -164,7 +164,7 @@ BUILT_SOURCES =
 CLEANFILES = $(SCRIPTS) su
 
 # Also remove these sometimes-built programs.
-# For example, even when excluded, they're built via sc_check-AUTHORS.
+# For example, even when excluded, they're built via _sc_check-AUTHORS.
 CLEANFILES += $(no_install__progs)
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib
@@ -677,10 +677,10 @@ check-duplicate-no-install: tr
 # translation inhibits printing of UTF-8 names, just skip this test.
 au_dotdot = authors-dotdot
 au_actual = authors-actual
-.PHONY: sc_check-AUTHORS
-sc_check-AUTHORS: $(all_programs)
+.PHONY: _sc_check-AUTHORS
+_sc_check-AUTHORS: $(all_programs)
        @locale=en_US.UTF-8;                            \
-       LC_ALL=$$locale ./cat --version         \
+       LC_ALL=$$locale ./cat --version                 \
            | grep ' Torbjorn ' > /dev/null             \
          && { echo "$@: skipping this check"; exit 0; }; \
        rm -f $(au_actual) $(au_dotdot);                \