diff options
| author | Eric Blake <ebb9@byu.net> | 2008-03-04 20:54:45 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2008-03-04 20:54:45 +0100 |
| commit | 07bc841590ceccf8eac9a98d55001bb0412f5299 (patch) | |
| tree | 56499039658655ddcfee2cf51b2a4da2f9608665 /GNUmakefile | |
| parent | dd647e78ca073723c0e3c2d7de243be0b7ab2108 (diff) | |
| download | coreutils-07bc841590ceccf8eac9a98d55001bb0412f5299.tar.xz | |
Reinstate GNUmakefile patch, but with workaround for automake.
* configure.ac (AC_CONFIG_LINKS): Use shell variable to bypass
automake distclean rules.
* Makefile.am (distclean-local): Clean GNUmakefile in VPATH builds,
since we are bypassing automake.
* GNUmakefile (_is-dist-target): 'distclean' is not a dist target.
Diffstat (limited to 'GNUmakefile')
| -rw-r--r-- | GNUmakefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile index 2fce1fdb7..95758f5e5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -45,7 +45,8 @@ _curr-ver := $(VERSION) # Ensure that $(VERSION) is up to date for dist-related targets, but not # for others: running autoreconf and recompiling everything isn't cheap. ifeq (0,$(MAKELEVEL)) - _is-dist-target = $(filter dist% alpha beta major,$(MAKECMDGOALS)) + _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 \ $(srcdir)/.tarball-version) |