From 56a88e9522a37a741bfb7854915c9ce6274e3b0f Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 24 May 2011 20:40:16 +0200 Subject: 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. --- src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Makefile.am b/src/Makefile.am index 6083b396e..908cd332d 100644 --- 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); \ -- cgit v1.2.3-70-g09d2