From 5ffd9429a89422b6e15f8d05c8ce3ad504e958de Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 7 Jan 2015 10:27:13 +0100 Subject: configury: fix bad usage of srcdir Note: Revealed thanks to automake 1.5 rebase. * configure.ac ($c_s): Use top_builddir. * tests/Makefile.am (CHECK_DEPS): Use top_builddir. --- configure.ac | 2 +- tests/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 298af77..792dcff 100644 --- a/configure.ac +++ b/configure.ac @@ -66,7 +66,7 @@ SED_CALL="\$(SED) \$(SED_RULES)" m4_pattern_allow(AM_V_GEN) INSTANTIATE="\$(AM_V_GEN)\$(SED_CALL) \$< > \$@" INSTANTIATE_SCRIPT="\$(INSTANTIATE) && chmod +x \$@" -c_s='$(top_srcdir)/config.status' +c_s='$(top_builddir)/config.status' AC_SUBST([SED_RULES]) AC_SUBST([SED_CALL]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 28197e4..93bef19 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) $(srcdir)/../$(TEST_GEN_FILES_LIST) +CHECK_DEPS = atconfig atlocal $(TESTSUITE) $(top_builddir)/$(TEST_GEN_FILES_LIST) atlocal: atlocal.in $(c_s) $(INSTANTIATE) -- cgit