diff options
| author | Jim Meyering <meyering@redhat.com> | 2008-03-12 12:34:05 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-03-12 13:52:51 +0100 |
| commit | a5d8b18bea472801c5ab31e96032523ec54f907b (patch) | |
| tree | be22cb3c17e8328f0e6b90bb36a1d2051310e980 | |
| parent | dec8bb25bb6da2fe9fe6dd63c0fbbd593a0e94cb (diff) | |
| download | coreutils-a5d8b18bea472801c5ab31e96032523ec54f907b.tar.xz | |
Generalize GNUmakefile, ...
...so that it can be used unmodified by autoconf.
* GNUmakefile: Include optional file, GNUmakefile.cfg.
Autoconf will use this to override _autoreconf and to export PATH.
(_autoreconf): Define.
(_dummy): cd to $(srcdir) before removing autom4te.cache.
| -rw-r--r-- | GNUmakefile | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/GNUmakefile b/GNUmakefile index 719cfadb1..8bbd6c8fc 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -40,10 +40,13 @@ export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner include Makefile -_curr-ver := $(VERSION) +# Some projects override e.g., _autoreconf here. +-include $(srcdir)/GNUmakefile.cfg + +_autoreconf ?= autoreconf # Ensure that $(VERSION) is up to date for dist-related targets, but not -# for others: running autoreconf and recompiling everything isn't cheap. +# for others: rerunning autoreconf and recompiling everything isn't cheap. ifeq (0,$(MAKELEVEL)) _is-dist-target = $(filter-out %clean, \ $(filter dist% alpha beta major,$(MAKECMDGOALS))) @@ -52,7 +55,7 @@ ifeq (0,$(MAKELEVEL)) $(srcdir)/.tarball-version) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver)) - _dummy := $(shell rm -rf autom4te.cache; (cd $(srcdir) && autoreconf)) + _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache && $(_autoreconf))) endif endif endif |