Re: two

[Jim Meyering]

Ralf Wildenhues <address@hidden> wrote:
> Jim Meyering <jim <at> meyering.net> writes:
>> Subject: [PATCH] avoid "make distcheck" failure due to src/Makefile.am
>>
>> * src/Makefile.am (cu_install_program): Define to $(INSTALL_PROGRAM),
>> not obsolescent @address@hidden
>
>> --- a/src/Makefile.am
>> +++ b/src/Makefile.am
>> @@ -467,7 +467,7 @@ sc_tight_scope: $(all_programs)
>>
>>  # Use the just-built ./ginstall, when not cross-compiling.
>>  if CROSS_COMPILING
>> -cu_install_program = @INSTALL_PROGRAM@
>> +cu_install_program = $(INSTALL_PROGRAM)
>>  else
>>  cu_install_program = ./ginstall
>>  endif
>
> This cannot work: INSTALL_PROGRAM is defined as $(cu_install_program).
> So you have a loop.

Thanks for spotting that.
I've dropped that patch and expect to push this one instead:

>From 2a4dcb627ea6310c2be0e8f570b470754bd1fc7e Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Fri, 26 Sep 2008 23:11:18 +0200
Subject: [PATCH] maint: relax a check so "make distcheck" succeeds again

* maint.mk (makefile-check): Relax the check, in order to exempt
the necessary use of a sole @address@hidden Makefile.am variable.
---
 maint.mk |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/maint.mk b/maint.mk
index 2987272..e5d3fee 100644
--- a/maint.mk
+++ b/maint.mk
@@ -550,8 +550,11 @@ check-AUTHORS:
 # Ensure that we use only the standard $(VAR) notation,
 # not @...@ in Makefile.am, now that we can rely on automake
 # to emit a definition for each substituted variable.
+# We use perl rather than "grep -nE ..." to exempt a single
+# use of an @address@hidden variable name in src/Makefile.am.
 makefile-check:
-       @grep -nE '@[A-Z_0-9]+@'                                        \
+       @perl -ne '/address@hidden@/ && !/^cu_install_program =/'       \
+         -e 'and (print "$$ARGV:$$.: $$_"), $$m=1; END {exit !$$m}'    \
            $$($(VC_LIST_EXCEPT) | grep -E '(^|/)Makefile\.am$$')       \
          && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :

--
1.6.0.2.307.gc427