diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2014-09-18 13:05:13 +0200 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2014-09-18 13:11:11 +0200 |
| commit | fc976d7de6c88cae8c4ac9946f963f5e736a17ea (patch) | |
| tree | 2a882ff27b64ddabd7348109927fd064ff27b09c | |
| parent | f6ce954de17d1d7ea312e610231e0196cf9c0ffb (diff) | |
| download | postgresql-setup-fc976d7de6c88cae8c4ac9946f963f5e736a17ea.tar.gz postgresql-setup-fc976d7de6c88cae8c4ac9946f963f5e736a17ea.tar.xz postgresql-setup-fc976d7de6c88cae8c4ac9946f963f5e736a17ea.zip | |
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.
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 | ||||
| -rw-r--r-- | tests/testsuite.at | 4 |
4 files changed, 9 insertions, 6 deletions
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 diff --git a/configure.ac b/configure.ac index 554810d..3e0f378 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,7 @@ AC_SUBST([DISTSUFF]) AC_CONFIG_TESTDIR(tests) AC_CONFIG_FILES([tests/Makefile]) AM_MISSING_PROG([AUTOM4TE], [autom4te]) -AC_SUBST([TEST_GEN_FILES_LIST], [$\(top_srcdir\)/.generated_files]) +AC_SUBST([TEST_GEN_FILES_LIST], [.generated_files]) # Instatiating generated files by sed instead of config.status. diff --git a/tests/Makefile.am b/tests/Makefile.am index 1ec404d..28197e4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -21,7 +21,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac } >'$(srcdir)/package.m4' TESTSUITE = $(srcdir)/testsuite -CHECK_DEPS = atconfig atlocal $(TESTSUITE) $(TEST_GEN_FILES_LIST) +CHECK_DEPS = atconfig atlocal $(TESTSUITE) $(srcdir)/../$(TEST_GEN_FILES_LIST) atlocal: atlocal.in $(c_s) $(INSTANTIATE) @@ -42,3 +42,4 @@ $(TESTSUITE): $(srcdir)/testsuite.at $(srcdir)/package.m4 $(AM_V_GEN)$(AUTOTEST) -I '$(srcdir)' -o $@.tmp $@.at && \ mv $@.tmp $@ +DISTCLEANFILES = atconfig atlocal diff --git a/tests/testsuite.at b/tests/testsuite.at index 9d18b29..81f2b2f 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -2,13 +2,13 @@ AT_INIT AT_COLOR_TESTS AT_SETUP([Check files are generated correctly]) -AT_CHECK([file_list=$top_srcdir/$at_testdir/$TEST_GEN_FILES_LIST +AT_CHECK([file_list=$abs_top_builddir/$TEST_GEN_FILES_LIST test -f "$file_list" || { echo "no such file '$file_list'" ; exit 1 ; } pattern='@[[a-zA-Z0-9_]]*@' while read file; do - file=${top_srcdir}/$file + file=$abs_top_builddir/$file grep $pattern $file && echo "file $file is incomplete" && exit 1 done < $file_list |