changeset 17032:ab43151876b5

gnumakefile: better interaction with Automake-NG * modules/gnumakefile [Makefile.am]: The makefiles generated by Automake-NG always contain a definition of VPATH, even in non-VPATH builds (its value being simply '.' in that case). So, in the 'clean-GNUmakefile' rule, to determine whether running under a VPATH setup, compare '$(srcdir)' to '.' rather than checking whether '$(VPATH)' expands to the empty string.
author Stefano Lattarini <stefano.lattarini@gmail.com>
date Thu, 02 Aug 2012 18:51:08 +0200
parents 8f51efda6717
children 4f196cfd0ca8
files ChangeLog modules/gnumakefile
diffstat 2 files changed, 11 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-02  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	gnumakefile: better interaction with Automake-NG
+	* modules/gnumakefile [Makefile.am]: The makefiles generated by
+	Automake-NG always contain a definition of VPATH, even in non-VPATH
+	builds (its value being simply '.' in that case).  So, in the
+	'clean-GNUmakefile' rule, to determine whether running under a
+	VPATH setup, compare '$(srcdir)' to '.' rather than checking whether
+	'$(VPATH)' expands to the empty string.
+
 2012-08-02  Carlo de Falco  <carlo.defalco@polimi.it>  (tiny change)
 
 	base64: Use extern C scope in header file, for C++.
--- a/modules/gnumakefile
+++ b/modules/gnumakefile
@@ -21,7 +21,7 @@
 Makefile.am:
 distclean-local: clean-GNUmakefile
 clean-GNUmakefile:
-	test x'$(VPATH)' != x && rm -f $(top_builddir)/GNUmakefile || :
+	test '$(srcdir)' = . || rm -f $(top_builddir)/GNUmakefile
 
 Include: