diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-02 18:51:08 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-08-04 20:08:52 +0200 |
| commit | ec58403a04a037309547784ef7338d40cd49f475 (patch) | |
| tree | 2cca66868b4498fdb2c25cbccd7fa12803995d19 | |
| parent | 0e3af50c9e20938bd1cea0182bf749ce61cb6782 (diff) | |
| download | gnulib-ec58403a04a037309547784ef7338d40cd49f475.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | modules/gnumakefile | 2 |
2 files changed, 11 insertions, 1 deletions
@@ -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++. diff --git a/modules/gnumakefile b/modules/gnumakefile index a86475a3ff..f917e36fca 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: |