diff options
| author | Eric Blake <ebb9@byu.net> | 2008-03-21 22:43:01 -0600 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2008-03-21 22:43:01 -0600 |
| commit | 34d1406addd357d1d44c5b85921fa167e45e2a65 (patch) | |
| tree | e10fa41cdbe6ab22e3267167d139f8b4b5516602 /GNUmakefile | |
| parent | 6893b8be8a760345c1af22dad7b7751aa7e87973 (diff) | |
| download | autoconf-34d1406addd357d1d44c5b85921fa167e45e2a65.tar.gz | |
* GNUmakefile: Resynchronize with gnulib.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/GNUmakefile b/GNUmakefile index fac11d3d..38dd1262 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -44,15 +44,19 @@ include Makefile -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. -ifeq (0,$(MAKELEVEL)) +_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))) 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)) |