maint: fix and simplify maintainer checks

Some of them can be simplified after the previous changes, some
of them have been downright broken by them, and need fixing.

* src/local.mk: Adjust some comments.
(EXTRA_DIST): Avoid SPACE-TAB sequences.
(src/dircolors.h, src/fs.h src/fs-is-local.h): Avoid 8-SPACES
indentation.
(_sc_check-AUTHORS): Move ...
* cfg.mk (sc_check-AUTHORS): ... here (superseding the old rule
with the same name, that was just a recursive invocation to it).
Adjust the paths of the invoked coreutils programs, to account
for the fact that this rule now runs in the top-level build dir,
not in the 'src/' subdir.  Other minor cosmetic adjustments.
(ALL_RECURSIVE_TARGETS): Remove 'sc_option_desc_uppercase' and
'sc_man_file_correlation', since they no longer entail any
recursive make invocation.
(sc_option_desc_uppercase): Remove dependency from $(all_programs):
it isn't actually needed.
(check-programs-vs-x): Likewise.  Also, fix heading comments to
truly reflect what this check does.
(all-progs-but-lbracket): Strip the 'src/' prefix from each entry
in the list of programs; this avoids a spurious failure in the
'check-programs-vs-x' recipe.
(.PHONY): No need to list targets 'sc_man_file_correlation' and
'sc_option_desc_uppercase': they are automatically declared phony
by 'maint.mk', being recognized as syntax checks.

1 files changed, 7 insertions, 37 deletions

diff --git a/src/local.mk b/src/local.mk
index 24462009f..df09f0241 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -55,8 +55,8 @@ noinst_HEADERS =		\
   src/wheel.h			\
   src/uname.h
 
-EXTRA_DIST += 		\
-  src/dcgen 		\
+EXTRA_DIST +=		\
+  src/dcgen		\
   src/dircolors.hin	\
   src/tac-pipe.c	\
   src/wheel-gen.pl	\
@@ -66,7 +66,8 @@ EXTRA_DIST += 		\
 CLEANFILES = $(SCRIPTS)
 
 # 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'
+# or 'dist'.
 CLEANFILES += $(no_install__progs)
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib
@@ -368,7 +369,7 @@ BUILT_SOURCES += src/dircolors.h
 src/dircolors.h: src/dcgen src/dircolors.hin
 	$(AM_V_GEN)rm -f $@ $@-t
 	$(AM_V_at)$(PERL) -w -- $(srcdir)/src/dcgen \
-	                        $(srcdir)/src/dircolors.hin > $@-t
+				$(srcdir)/src/dircolors.hin > $@-t
 	$(AM_V_at)chmod a-w $@-t
 	$(AM_V_at)mv $@-t $@
 
@@ -450,7 +451,7 @@ BUILT_SOURCES += src/fs-is-local.h
 src/fs-is-local.h: src/stat.c src/extract-magic
 	$(AM_V_GEN)rm -f $@
 	$(AM_V_at)$(PERL) $(srcdir)/src/extract-magic \
-	                  --local $(srcdir)/src/stat.c > $@t
+			  --local $(srcdir)/src/stat.c > $@t
 	$(AM_V_at)chmod a-w $@t
 	$(AM_V_at)mv $@t $@
 
@@ -458,7 +459,7 @@ BUILT_SOURCES += src/fs.h
 src/fs.h: src/stat.c src/extract-magic
 	$(AM_V_GEN)rm -f $@
 	$(AM_V_at)$(PERL) $(srcdir)/src/extract-magic \
-	                  $(srcdir)/src/stat.c > $@t
+			  $(srcdir)/src/stat.c > $@t
 	$(AM_V_at)chmod a-w $@t
 	$(AM_V_at)mv $@t $@
 
@@ -522,37 +523,6 @@ check-README:
 check-duplicate-no-install: src/tr
 	$(AM_V_GEN)test -z "`echo '$(EXTRA_PROGRAMS)' | tr ' ' '\n' | uniq -d`"
 
-# Ensure that the list of programs and author names is accurate.
-# We need a UTF8 locale.  If a lack of locale support or a missing
-# 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)
-	@locale=en_US.UTF-8;				\
-	LC_ALL=$$locale ./cat --version			\
-	    | grep ' Torbjorn '	> /dev/null		\
-	  && { echo "$@: skipping this check"; exit 0; }; \
-	rm -f $(au_actual) $(au_dotdot);		\
-	for i in `ls $(all_programs)			\
-	    | sed -e 's,^src/,,' -e 's,$(EXEEXT)$$,,'	\
-	    | sed /libstdbuf/d				\
-	    | $(ASSORT) -u`; do				\
-	  test "$$i" = '[' && continue;			\
-	  exe=$$i;					\
-	  if test "$$i" = install; then			\
-	    exe=ginstall;				\
-	  elif test "$$i" = test; then			\
-	    exe='[';					\
-	  fi;						\
-	  LC_ALL=$$locale ./$$exe --version		\
-	    | perl -0 -pi -e 's/,\n/, /gm'		\
-	    | sed -n -e '/Written by /{ s//'"$$i"': /;'	\
-		  -e 's/,* and /, /; s/\.$$//; p; }';	\
-	done > $(au_actual) &&				\
-	sed -n '/^[^ ][^ ]*:/p' $(top_srcdir)/AUTHORS > $(au_dotdot) && \
-	diff $(au_actual) $(au_dotdot) && rm -f $(au_actual) $(au_dotdot)
-
 # Use the just-built 'ginstall', when not cross-compiling.
 if CROSS_COMPILING
 cu_install_program = @INSTALL_PROGRAM@