Improve support for out-of-tree catalogue generation.

diff --git a/ChangeLog b/ChangeLog
index bb59ead..5bd5196 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2020-06-17  Keith Marshall  <keith@users.osdn.me>
+
+       Improve support for out-of-tree catalogue generation.
+
+       * Makefile.in: When running the testsuite, use ${abs_top_srcdir}
+       references, rather than ${top_srcdir}; this is required, to ensure
+       that testsuite path names are correctly resolved, when the build
+       directory is not a subdirectory of ${top_srcdir}, (as is likely
+       to be the case, when generating a catalogue snapshot, which is
+       to be distributed with the mingw-get setup package).
+
 2020-06-03  Keith Marshall  <keith@users.osdn.me>
 
        Publish MinGW.org WSL-5.3.3 package set.

diff --git a/Makefile.in b/Makefile.in
index c89b83c..8a0ecde 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -41,6 +41,7 @@ FORCE:
 # when any of their respective sources are modified.
 #
 top_srcdir = @top_srcdir@
+abs_top_srcdir = @abs_top_srcdir@
 VPATH = ${top_srcdir}
 
 configure: configure.ac makeopts.m4
@@ -63,16 +64,15 @@ all-distfiles: all
 # the test suite to validate all source documents; the following rules
 # provide the interface which is needed to run the test suite.
 #
-srcdir = @srcdir@
 check: tests/Makefile
        cd tests; $(MAKE_RECURSIVE) $@
 
-${srcdir}/tests/configure: ${srcdir}/tests/configure.ac VERSION.m4
-       cd ${srcdir}/tests; autoconf
+${srcdir}/tests/configure: ${abs_top_srcdir}/tests/configure.ac VERSION.m4
+       cd ${abs_top_srcdir}/tests; autoconf
 
-tests/Makefile: ${srcdir}/tests/configure
+tests/Makefile: ${abs_top_srcdir}/tests/configure
        test -d tests || mkdir tests
-       cd tests; ../${srcdir}/tests/configure
+       cd tests; ${abs_top_srcdir}/tests/configure
 
 # To support optimised "mingw-get update", the package lists must be
 # dynamically updated, to correctly identify the latest issue of each