bug-coreutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] build: correct coreutils-specific distcheck rules


From: Jim Meyering
Subject: [PATCH] build: correct coreutils-specific distcheck rules
Date: Sun, 20 Dec 2009 10:58:49 +0100

"make distcheck" was failing due to two separate problems.
Here's the fix.

>From d98b1b35a6dad1f2964e530834cc22931f4f75cc Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sun, 20 Dec 2009 10:50:29 +0100
Subject: [PATCH] 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.
---
 dist-check.mk |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist-check.mk b/dist-check.mk
index af101d1..dd30db2 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)
--
1.6.6.rc3.271.g3d40f




reply via email to

[Prev in Thread] Current Thread [Next in Thread]