From fc976d7de6c88cae8c4ac9946f963f5e736a17ea Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 18 Sep 2014 13:05:13 +0200
Subject: configury: fix make distcheck errors

* Makefile.am (EXTRA_DIST): Always use $(srcdir) when referencing
wildcards.
(install-data-hook): Return true even for non-root make install.
(DISTCLEANFILES): Mention ChangeLog.
* configure.ac (TEST_GEN_FILES_LIST): Only use the basename.
* tests/Makefile.am (CHECK_DEPS): Fix reference to
TEST_GEN_FILES_LIST.
(DISTCLEANFILES): Mention also atconfig and atlocal.
* tests/testsuite.at: Fix reference to $TEST_GEN_FILES_LIST, use
always $abs_top_builddir when referencing built files.
---
 Makefile.am | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index a8bdb6a..b15086b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ postgresql$(DISTSUFF).service: postgresql.service.in $(c_s)
 README.rpm-dist: README.rpm-dist.in $(c_s)
 	$(INSTANTIATE)
 
-EXTRA_DIST = *.in
+EXTRA_DIST = $(srcdir)/*.in
 
 GENERATED_FILES = $(bin_SCRIPTS) \
 		  $(libexec_SCRIPTS) \
@@ -59,7 +59,7 @@ $(TEST_GEN_FILES_LIST): $(GENERATED_FILES)
 	done
 
 install-data-hook:
-	test `id -u` -eq 0 && systemctl daemon-reload
+	test `id -u` -ne 0 || systemctl daemon-reload
 
 GL_GEN_BIN = gitlog-to-changelog
 GL_GEN = $(SHELL) $(top_srcdir)/$(config_aux_dir)/missing --run \
@@ -79,3 +79,5 @@ ChangeLog:
 	$(AM_V_GEN)$(GL_GEN)
 
 dist-hook: ChangeLog
+
+DISTCLEANFILES = ChangeLog
-- 
cgit