From ec58403a04a037309547784ef7338d40cd49f475 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 2 Aug 2012 18:51:08 +0200 Subject: [PATCH] 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. --- ChangeLog | 10 ++++++++++ modules/gnumakefile | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 425c02db5..1becccf29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2012-08-02 Stefano Lattarini + + 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 (tiny change) base64: Use extern C scope in header file, for C++. diff --git a/modules/gnumakefile b/modules/gnumakefile index a86475a3f..f917e36fc 100644 --- a/modules/gnumakefile +++ b/modules/gnumakefile @@ -21,7 +21,7 @@ m4_if(m4_version_compare([2.61a.100], 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: -- 2.11.0