two "make distcheck"-related patches

[Jim Meyering]

Here are two small "make distcheck"-related patches:
The first one is to avoid false-positives on non-version-controlled
Makefile.am files in the hierarchy (for me it was one like this:
coreutils-6.12.197-8c4a6).

>From 13a2025998271ad69058987358c92074e627848c Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 24 Sep 2008 15:25:12 +0200
Subject: [PATCH] maint: avoid using find -name Makefile.am; could get false 
positives

* maint.mk (makefile-check): Instead, search for the offending
@...@ construct only in version-controlled files.
---
 maint.mk |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/maint.mk b/maint.mk
index f3bbf9a..2987272 100644
--- a/maint.mk
+++ b/maint.mk
@@ -551,7 +551,8 @@ check-AUTHORS:
 # not @...@ in Makefile.am, now that we can rely on automake
 # to emit a definition for each substituted variable.
 makefile-check:
-       @grep -nE '@[A-Z_0-9]+@' `find . -name Makefile.am` \
+       @grep -nE '@[A-Z_0-9]+@'                                        \
+           $$($(VC_LIST_EXCEPT) | grep -E '(^|/)Makefile\.am$$')       \
          && { echo '$(ME): use $$(...), not @...@' 1>&2; exit 1; } || :

 news-date-check: NEWS
--
1.6.0.2.307.gc427


>From c1ce5bda79fbb486bc38ea19027d7e043d928f97 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 24 Sep 2008 16:23:09 +0200
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
---
 src/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3625878..06782ad 100644
--- 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
--
1.6.0.2.307.gc427