Use a more general GNUmakefile.

* GNUmakefile: Sync from coreutils.
* Makefile.am (EXTRA_DIST): Add GNUmakefile.cfg.
* GNUmakefile.cfg: New file.
This commit is contained in:
Jim Meyering 2008-03-12 13:14:44 +01:00
parent 3c108e5e9d
commit e30dffd714
3 changed files with 16 additions and 11 deletions

View File

@ -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

7
GNUmakefile.cfg Normal file
View File

@ -0,0 +1,7 @@
# This file is '-include'd into GNUmakefile.
# Build with our own versions of these tools, when possible.
export PATH = $(shell echo "`pwd`/tests:$$PATH")
# Remove the autoreconf-provided INSTALL, so that we regenerate it.
_autoreconf = autoreconf -i -v && rm -f INSTALL

View File

@ -25,7 +25,8 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 \
BUGS \
GNUmakefile Makefile.maint Makefile.cfg \
GNUmakefile GNUmakefile.cfg \
Makefile.maint Makefile.cfg \
build-aux/git-version-gen \
config/announce-gen config/prev-version.txt