diff options
author | Jim Meyering <meyering@redhat.com> | 2008-03-12 13:14:44 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-03-13 22:16:52 +0100 |
commit | e30dffd71447fb41189390cabbabcf8e7e962549 (patch) | |
tree | 3a47aecd3a2b20235cab40eef1d87af4f6f3dec0 /GNUmakefile | |
parent | 3c108e5e9d4eeff6faebc3107dfd11e3b238227e (diff) | |
download | autoconf-e30dffd71447fb41189390cabbabcf8e7e962549.tar.gz |
Use a more general GNUmakefile.
* GNUmakefile: Sync from coreutils.
* Makefile.am (EXTRA_DIST): Add GNUmakefile.cfg.
* GNUmakefile.cfg: New file.
Diffstat (limited to 'GNUmakefile')
-rw-r--r-- | GNUmakefile | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/GNUmakefile b/GNUmakefile index e22015b8..8bbd6c8f 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -38,14 +38,15 @@ ifeq ($(_have-Makefile),yes) # Make tar archive easier to reproduce. export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner -# Build with our own versions of these tools, when possible. -export PATH = $(shell echo "`pwd`/tests:$$PATH") - include Makefile +# 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: rerunning autoconf and recompiling everything isn't cheap. -# Remove the autoreconf-provided INSTALL, so that we regenerate it. +# 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))) @@ -54,11 +55,7 @@ ifeq (0,$(MAKELEVEL)) $(srcdir)/.tarball-version) ifneq ($(_curr-ver),$(VERSION)) $(info INFO: running autoreconf for new version string: $(_curr-ver)) - _dummy := $(shell \ - cd $(srcdir) \ - && rm -rf autom4te.cache \ - && autoreconf -i -v \ - && rm -f INSTALL) + _dummy := $(shell cd $(srcdir) && rm -rf autom4te.cache && $(_autoreconf))) endif endif endif |