From: Pádraig Brady <P@draigBrady.com>
Date: Fri, 18 Jul 2014 13:21:19 +0000 (+0100)
Subject: build: don't distribute generated coreutils.h
X-Git-Tag: v8.23~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=v8.22-156-g09937e9d0;p=thirdparty%2Fcoreutils.git

build: don't distribute generated coreutils.h

This issue was identified by the manifest comparisons
done by `make distcheck`

* src/local.mk (noinst_HEADERS): Remove coreutils.h from this always
distributed list.
(nodist_src_coreutils_SOURCES): Add coreutils.h as its contents
are determined at configure time, so pointless to distribute.
(src_coreutils_SOURCES): Define explicitly so that the corresponding
nodist_ variable is honored.
(DISTCLEANFILES): Add coreutils.h to this rather than CLEANFILES,
as its contents are determined at configure time.
---

diff --git a/src/local.mk b/src/local.mk
index e35d28688f..c0d04d680c 100644
--- a/src/local.mk
+++ b/src/local.mk
@@ -42,7 +42,6 @@ noinst_PROGRAMS =		\
 noinst_HEADERS =		\
   src/chown-core.h		\
   src/copy.h			\
-  src/coreutils.h		\
   src/cp-hash.h			\
   src/dircolors.h		\
   src/fiemap.h			\
@@ -348,6 +347,9 @@ src_ginstall_SOURCES = src/install.c src/prog-fprintf.c $(copy_sources) \
 # This is for the '[' program.  Automake transliterates '[' and '/' to '_'.
 src___SOURCES = src/lbracket.c
 
+nodist_src_coreutils_SOURCES = src/coreutils.h
+src_coreutils_SOURCES = src/coreutils.c
+
 src_cp_SOURCES = src/cp.c $(copy_sources) $(selinux_sources)
 src_dir_SOURCES = src/ls.c src/ls-dir.c
 src_vdir_SOURCES = src/ls.c src/ls-vdir.c
@@ -565,7 +567,7 @@ src/version.h: Makefile
 # once for each program list on $(single_binary_progs). Note that
 # for [ the macro invocation is:
 #   SINGLE_BINARY_PROGRAM("[", _)
-CLEANFILES += src/coreutils.h
+DISTCLEANFILES += src/coreutils.h
 src/coreutils.h: Makefile
 	$(AM_V_GEN)rm -f $@
 	$(AM_V_at)for prog in $(single_binary_progs); do	\