From 3497dfc9c1403eece9b3badbf5936195ee943bf9 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 17 Jul 2003 22:27:44 +0000
Subject: [PATCH] .

---
 lib/Makefile.in   | 2 +-
 src/Makefile.in   | 4 ++--
 tests/Makefile.in | 8 +++++++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile.in b/lib/Makefile.in
index f1e6286e4d..79644d61d9 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -156,7 +156,7 @@ target_alias = @target_alias@
 
 noinst_LIBRARIES = libfetish.a
 
-INCLUDES = -I.. -I$(srcdir)
+AM_CPPFLAGS = -I.. -I$(srcdir)
 
 libfetish_a_SOURCES = \
   acl.h acl.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index 2c8f3f5648..565a9389bf 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -182,7 +182,7 @@ EXTRA_DIST = dcgen dircolors.hin tac-pipe.c \
 
 CLEANFILES = $(SCRIPTS) su
 
-INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
+AM_CPPFLAGS = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../lib
 
 # Sometimes, the expansion of $(LIBINTL) includes -lc which may
 # include modules defining variables like `optind', so libfetish.a
@@ -866,7 +866,7 @@ uninstall-binPROGRAMS:
 	done
 
 clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) > /dev/null 2>&1 || /bin/rm -f $(bin_PROGRAMS)
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 
 installcheck-binPROGRAMS: $(bin_PROGRAMS)
 	bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index efd580a419..f7f286145f 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -151,9 +151,15 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
+all_programs = \
+  echo 'spy:;@echo $$(all_programs)'					\
+    | MAKEFLAGS= $(MAKE) -s -C $(srcdir)/../src -f Makefile -f - spy	\
+    | fmt -1 | sort -u
+
+
 TESTS = help-version
 TESTS_ENVIRONMENT = \
-  all_programs="$(bin_SCRIPTS) $(bin_PROGRAMS)"
+  all_programs="`$(all_programs)`"
 
 
 EXTRA_DIST = \
-- 
2.47.2