# HG changeset patch
# User Jim Meyering <meyering@redhat.com>
# Date 1284837987 -7200
# Node ID fe063c25c0ce0b3b7003941dd765ce8a9742dc44
# Parent  2fc14f6d73d4b793494c855d126fc08d7ecb1ac8
maint.mk: avoid unexpanded \n in two diagnostics

* top/maint.mk (sc_prohibit_always_true_header_tests):
Don't use a literal \n in a halt=... assignment.  It would not be
expanded, and the two \n bytes would appear in the diagnostic output
rather than the desired newline.  Use halt=$$(printf ... instead.
(sc_vulnerable_makefile_CVE-2009-4029): Likewise.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-09-18  Jim Meyering  <meyering@redhat.com>
+
+	maint.mk: avoid unexpanded \n in two diagnostics
+	* top/maint.mk (sc_prohibit_always_true_header_tests):
+	Don't use a literal \n in a halt=... assignment.  It would not be
+	expanded, and the two \n bytes would appear in the diagnostic output
+	rather than the desired newline.  Use halt=$$(printf ... instead.
+	(sc_vulnerable_makefile_CVE-2009-4029): Likewise.
+
 2010-09-18  Bruno Haible  <bruno@clisp.org>
 
 	netinet_in: Doc tweak.
diff --git a/top/maint.mk b/top/maint.mk
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -668,8 +668,9 @@
 	@or=$(gl_header_upper_case_or_);				\
 	re="HAVE_($$or)_H";						\
 	prohibit='\<'"$$re"'\>'						\
-	halt='do not test the above HAVE_<header>_H symbol(s);\n'\
-'  with the corresponding gnulib module, they are always true'		\
+	halt=$$(printf '%s\n'						\
+	'do not test the above HAVE_<header>_H symbol(s);'		\
+	'  with the corresponding gnulib module, they are always true')	\
 	  $(_sc_search_regexp)
 
 # ==================================================================
@@ -1012,9 +1013,10 @@
 sc_vulnerable_makefile_CVE-2009-4029:
 	@prohibit='perm -777 -exec chmod a\+rwx|chmod 777 \$$\(distdir\)' \
 	in_files=$$(find $(srcdir) -name Makefile.in)			\
-	halt='the above files are vulnerable; beware of running\n'\
-'"make dist*" rules, and upgrade to fixed automake\n'\
-'see http://bugzilla.redhat.com/542609 for details'			\
+	halt=$$(printf '%s\n'						\
+	  'the above files are vulnerable; beware of running'		\
+	  '  "make dist*" rules, and upgrade to fixed automake'		\
+	  '  see http://bugzilla.redhat.com/542609 for details')	\
 	  $(_sc_search_regexp)
 
 vc-diff-check: