From: Jim Meyering <meyering@redhat.com>
Date: Sun, 20 Dec 2009 09:50:29 +0000 (+0100)
Subject: build: correct coreutils-specific distcheck rules
X-Git-Tag: v8.3~42
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d98b1b35a6dad1f2964e530834cc22931f4f75cc;p=thirdparty%2Fcoreutils.git

build: correct coreutils-specific distcheck rules

* dist-check.mk (built_programs): Use $(bin_PROGRAMS), not $(PROGRAMS).
Otherwise, my-instcheck would fail due to non-installation of e.g.,
the noinst_PROGRAMS, setuidgid and getlimits.
(taint-distcheck): Correct the grep command that checks for libtool
traces in configure.
---

diff --git a/dist-check.mk b/dist-check.mk
index af101d1f5a..dd30db2266 100644
--- a/dist-check.mk
+++ b/dist-check.mk
@@ -10,7 +10,7 @@ t=$(tmpdir)/$(PACKAGE)/test
 pfx=$(t)/i
 
 built_programs =						\
-  $$(echo 'spy:;@echo $$(PROGRAMS)'				\
+  $$(echo 'spy:;@echo $$(bin_PROGRAMS)'				\
     | MAKEFLAGS= $(MAKE) -s -C src -f Makefile -f - spy		\
     | fmt -1 | sed 's,$(EXEEXT)$$,,' | sort -u)
 
@@ -47,7 +47,7 @@ preferred_tarball_ = $(distdir).tar.$(suffix_)
 # cannot deal with a space-tainted srcdir.
 ALL_RECURSIVE_TARGETS += taint-distcheck
 taint-distcheck: $(DIST_ARCHIVES)
-	grep '^[	 ]*LT_INIT' configure.ac >/dev/null && exit 0
+	grep '^[	 ]*LT_INIT' configure.ac >/dev/null && exit 0 || :
 	test -d $(t_taint) && chmod -R 700 $(t_taint) || :
 	-rm -rf $(t_taint) $(fake_home)
 	mkdir -p $(t_prefix) $(t_taint) $(fake_home)