Re: [PATCH] maint.mk: don't maintain a second build-aux variable.

[Jim Meyering]

Gary V. Vaughan wrote:
> Hi Jim,
>
> On 25 Oct 2011, at 15:18, Gary V. Vaughan wrote:
>> On 25 Oct 2011, at 15:05, Jim Meyering wrote:
>>> Actually, I think we can both get what we want.
>>> I suggest to adjust your patch so that make is guaranteed to fail
>>> with a nice diagnostic for anyone who defines build_aux in cfg.mk.
>>
>> It's in my queue, so I should get to it in a few days.  Thanks for the
>> feedback.
>
> Okay to push?
>
> * maint.mk (build-aux): Removed.  The maintainer-makefile module

Almost.
Please sync at least the above commit-log line from your ChangeLog.
That will fix the "build-aux" (s/-/_/) typo.

> depends on GNUmakefile, which already maintains a cfg.mk
> overridable $(_build-aux) for projects with a non-standard
> build-aux directory location, although without the $(srcdir)
> prefix.  Use that variable consistently instead of introducing a
> second one.  Adjust all call sites.
> ---
>  ChangeLog    |   10 ++++++++++
>  top/maint.mk |   17 +++++++++--------
>  2 files changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/ChangeLog b/ChangeLog
> index 93ee45e..660b9ce 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,3 +1,13 @@
> +2011-10-27  Gary V. Vaughan  <address@hidden>
> +
> +     maint.mk: don't maintain a second build-aux variable.
> +     * maint.mk (build_aux): Removed.  The maintainer-makefile module
> +     depends on GNUmakefile, which already maintains a cfg.mk
> +     overridable $(_build-aux) for projects with a non-standard
> +     build-aux directory location, although without the $(srcdir)
> +     prefix.  Use that variable consistently instead of introducing a
> +     second one.  Adjust all call sites.
...
> diff --git a/top/maint.mk b/top/maint.mk
...
>  ME := maint.mk
>
> -# Override this in cfg.mk if you use a non-standard build-aux directory.
> -build_aux ?= $(srcdir)/build-aux
> +ifneq ($(build_aux),)
> + $(error '*** set $$(_build-aux) relative to $$(srcdir) instead of 
> $$(build_aux)')

That line is longer than 80.
Please shorten or split it, and use a prefix of "$(ME): " as
in most of the other diagnostics in this file.  Or at least
include $(ME) somewhere, so people know where it's coming from.

Thanks.