Enable the sc_space_tab check

* cfg.mk: Enable the sc_space_tab check.  Exclude various xargs
test inputs and outputs from the check.
* locate/Makefile.am (dblocation.texi): Remove space-tab sequences.

3 files changed, 11 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 952b1cef..9591376e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,12 @@
 
 2011-06-11  James Youngman  <jay@gnu.org>
 
+	Enable the sc_space_tab check
+	* cfg.mk: Enable the sc_space_tab check.  Exclude various xargs
+	test inputs and outputs from the check.  Remove some obsolete
+	comments.
+	* locate/Makefile.am (dblocation.texi): Remove space-tab sequences.
+
 	Enable the sc_texinfo_acronym check
 	* cfg.mk: Enable the sc_texinfo_acronym check.  Exempt
 	doc/perm.text, which isn't ours anyway.
diff --git a/cfg.mk b/cfg.mk
index 99c50573..33e23080 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -23,11 +23,9 @@ local-checks-to-skip += sc_error_message_period sc_error_message_uppercase \
 # Errors I have not investigated; diagnose and fix later.
 local-checks-to-skip += sc_makefile_at_at_check
 
-# False positives I don't have a workaround for yet.
-# sc_space_tab: several .xo test output files contain this sequence
-#               for testing xargs's handling of white space.
-local-checks-to-skip += sc_space_tab
 exclude_file_name_regexp--sc_obsolete_symbols = build-aux/src-sniff\.py
+exclude_file_name_regexp--sc_space_tab = \
+	xargs/testsuite/(inputs/.*\.xi|xargs.(gnu|posix|sysv)/.*\.xo)$$
 
 # Skip sc_two_space_separator_in_usage because it reflects the requirements
 # of help2man.   It gets run on files that are not help2man inputs, and in
@@ -38,8 +36,6 @@ local-checks-to-skip += sc_two_space_separator_in_usage
 # apart later.
 local-checks-to-skip += sc_trailing_blank
 
-# Problems we can't easily fix because they apply to files which we
-# need to keep in sync, so can't easily make a local change to.
 # sc_texinfo_acronym: perms.texi from coreutils uses @acronym{GNU}.
 exclude_file_name_regexp--sc_texinfo_acronym = doc/perm\.texi
 
diff --git a/locate/Makefile.am b/locate/Makefile.am
index 53a8b53a..f8b71fb3 100644
--- a/locate/Makefile.am
+++ b/locate/Makefile.am
@@ -56,9 +56,9 @@ install-data-hook:
 dblocation.texi:
 	echo '@set LOCATE_DB $(LOCATE_DB)' > $@.tmp
 	if test -f $@ && cmp $@.tmp $@ >/dev/null ; then \
-		rm $@.tmp ; 		\
-	else				\
-		mv $@.tmp $@ ;		\
+	    rm $@.tmp ; \
+	else \
+	    mv $@.tmp $@ ; \
 	fi
 .PHONY: dblocation.texi