"Joel E. Denny" <[EMAIL PROTECTED]> wrote:
> On Sat, 9 Aug 2008, Joel E. Denny wrote:
>> I frequently run make maintainer-check during Bison development. I don't
>> see a need to update VERSION every time. Is the following patch
>> acceptable, or would it be better to rename maintainer-check* to something
>> else in Bison?
>
> Here's a more formal version of the patch I posted earlier this month.
> Is there a better way to handle this?
...
> diff --git a/top/GNUmakefile b/top/GNUmakefile
> index 7635e8d..86ad493 100644
> --- a/top/GNUmakefile
> +++ b/top/GNUmakefile
> @@ -53,7 +53,7 @@ _autoreconf ?= autoreconf
> _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, \
> + _is-dist-target = $(filter-out maintainer-check% %clean, \
> $(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
Hi Joel,
How about this instead?
Then it can be changed arbitrarily on a per-project basis.
>From 6e4373f0b071f6b604ce343e8267e45d25bf4aa6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <[EMAIL PROTECTED]>
Date: Tue, 26 Aug 2008 10:14:36 +0200
Subject: [PATCH] GNUmakefile: cfg.mk definitions override default
autoreconf-rerun policy
* top/GNUmakefile (_is-dist-target, _is-install-target): Make
these definitions conditional, so that they may be overridden, too.
---
top/GNUmakefile | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/top/GNUmakefile b/top/GNUmakefile
index 7635e8d..4b4cf15 100644
--- a/top/GNUmakefile
+++ b/top/GNUmakefile
@@ -53,9 +53,9 @@ _autoreconf ?= autoreconf
_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, \
+ _is-dist-target ?= $(filter-out %clean, \
$(filter maintainer-% dist% alpha beta major,$(MAKECMDGOALS)))
- _is-install-target = $(filter-out %check, $(filter install%,$(MAKECMDGOALS)))
+ _is-install-target ?= $(filter-out %check, $(filter
install%,$(MAKECMDGOALS)))
ifneq (,$(_is-dist-target)$(_is-install-target))
_curr-ver := $(shell cd $(srcdir) \
&& $(_build-aux)/git-version-gen .tarball-version)
--
1.6.0.1.90.g27a6e
