Mercurial > hg > octave-lojdl > gnulib-hg
changeset 9802:7bec57a5a30a
VPATH fix.
* build-aux/GNUmakefile (_have_git-version-gen): Look in correct dir.
Signed-off-by: Eric Blake <ebb9@byu.net>
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Thu, 20 Mar 2008 09:24:13 -0600 |
| parents | 152fac50e329 |
| children | ea3d98378dde |
| files | ChangeLog build-aux/GNUmakefile |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-20 Eric Blake <ebb9@byu.net> + + VPATH fix. + * build-aux/GNUmakefile (_have_git-version-gen): Look in correct dir. + 2008-03-20 Simon Josefsson <simon@josefsson.org> * build-aux/GNUmakefile: Make git-version-gen optional. Add
--- a/build-aux/GNUmakefile +++ b/build-aux/GNUmakefile @@ -40,18 +40,17 @@ include Makefile -# Allow cfg.mk to override this. -_build-aux ?= build-aux - # Some projects override e.g., _autoreconf here. -include $(srcdir)/cfg.mk include $(srcdir)/maint.mk +# Allow cfg.mk to override these. +_build-aux ?= build-aux _autoreconf ?= autoreconf # Ensure that $(VERSION) is up to date for dist-related targets, but not # for others: rerunning autoreconf and recompiling everything isn't cheap. -_have-git-version-gen := $(shell test -f ./$(_build-aux)/git-version-gen && echo yes) +_have-git-version-gen := $(shell test -f $(srcdir)/$(_build-aux)/git-version-gen && echo yes) ifeq ($(_have-git-version-gen)0,yes$(MAKELEVEL)) _is-dist-target = $(filter-out %clean, \ $(filter dist% alpha beta major,$(MAKECMDGOALS)))