From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 28 Mar 2009 23:53:40 +0000 (+0100)
Subject: Fix maintainer-check failure.
X-Git-Tag: v1.10b~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68a57a2e0cadf9f1b3c7629944ed6375d1d0b85d;p=thirdparty%2Fautomake.git

Fix maintainer-check failure.

* Makefile.am (maintainer-check): Do not complain if DESTDIR is
passed as argument to `make'.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 2d552e36d..d7337d7b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-03-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	* Makefile.am (maintainer-check): Do not complain if DESTDIR is
+	passed as argument to `make'.
+
 	* doc/automake.texi (Cross-Compilation): Fix underfull hbox.
 
 	Sync auxiliary files from upstream.
diff --git a/Makefile.am b/Makefile.am
index d637e10f4..1b36de171 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -273,13 +273,15 @@ maintainer-check: automake aclocal
 	done
 ## Overriding a Makefile macro on the command line is not portable when
 ## recursive targets are used.  Better use an envvar.  SHELL is an exception,
-## POSIX says it can't come from the environment.
+## POSIX says it can't come from the environment.  DESTDIRS is an exception,
+## too, as package authors are urged not to intitialize this anywhere.
 	@if grep -E '\$$MAKE .*(SHELL=.*=|=.*SHELL=)' $(srcdir)/tests/*.test; then \
 	  echo 'Rewrite "$$MAKE foo=bar SHELL=$$SHELL" as "foo=bar $$MAKE -e SHELL=$$SHELL"' 1>&2; \
 	  echo ' in the above lines, it is more portable.' 1>&2; \
 	  exit 1; \
 	fi
-	@if grep -v SHELL $(srcdir)/tests/*.test | grep '\$$MAKE .*=' ; then \
+	@if sed 's/DESTDIR=[^ ]*//; s/SHELL=[^ ]*//' $(srcdir)/tests/*.test | \
+	  grep '\$$MAKE .*=' ; then \
 	  echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above lines,' 1>&2; \
 	  echo 'it is more portable.' 1>&2; \
 	  exit 1; \
diff --git a/Makefile.in b/Makefile.in
index 7135f5329..ad302a597 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -940,7 +940,8 @@ maintainer-check: automake aclocal
 	  echo ' in the above lines, it is more portable.' 1>&2; \
 	  exit 1; \
 	fi
-	@if grep -v SHELL $(srcdir)/tests/*.test | grep '\$$MAKE .*=' ; then \
+	@if sed 's/DESTDIR=[^ ]*//; s/SHELL=[^ ]*//' $(srcdir)/tests/*.test | \
+	  grep '\$$MAKE .*=' ; then \
 	  echo 'Rewrite "$$MAKE foo=bar" as "foo=bar $$MAKE -e" in the above lines,' 1>&2; \
 	  echo 'it is more portable.' 1>&2; \
 	  exit 1; \