Mercurial > hg > octave-lyh > gnulib-hg
changeset 9801:152fac50e329
Make git-version-gen optional. Add _build-aux variable.
author | Simon Josefsson <simon@josefsson.org> |
---|---|
date | Thu, 20 Mar 2008 15:50:57 +0100 |
parents | b2c65dc6be73 |
children | 7bec57a5a30a |
files | ChangeLog build-aux/GNUmakefile |
diffstat | 2 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-03-20 Simon Josefsson <simon@josefsson.org> + + * build-aux/GNUmakefile: Make git-version-gen optional. Add + _build-aux variable. Suggested by Eric Blake <ebb9@byu.net>. + 2008-03-20 Eric Blake <ebb9@byu.net> Sync GNUmakefile with coreutils.
--- a/build-aux/GNUmakefile +++ b/build-aux/GNUmakefile @@ -40,6 +40,9 @@ 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 @@ -48,11 +51,12 @@ # Ensure that $(VERSION) is up to date for dist-related targets, but not # for others: rerunning autoreconf and recompiling everything isn't cheap. -ifeq (0,$(MAKELEVEL)) +_have-git-version-gen := $(shell test -f ./$(_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))) ifneq (,$(_is-dist-target)) - _curr-ver := $(shell cd $(srcdir) && ./build-aux/git-version-gen \ + _curr-ver := $(shell cd $(srcdir) && ./$(_build-aux)/git-version-gen \ $(srcdir)/.tarball-version) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver))