X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build-aux%2FGNUmakefile;fp=build-aux%2FGNUmakefile;h=d30f13b5051a0bf23f1eeebd2957d528fb0fb88e;hb=8b7bf418dde380e1d311ee68338a75182f2f4080;hp=a9d6196dad135569171ad00ad47732e462b1b0ae;hpb=216173c7d70cbd66f8791b6710cb8f8c3bf6eef9;p=gnulib.git diff --git a/build-aux/GNUmakefile b/build-aux/GNUmakefile index a9d6196da..d30f13b50 100644 --- a/build-aux/GNUmakefile +++ b/build-aux/GNUmakefile @@ -40,18 +40,17 @@ export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner 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)))