# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1646332630 18000
# Node ID 4392386b5ecba62b34054838c8b6e86f3c9ddb7c
# Parent  131c5045fbd3fa42a011de37eace95e890f7815a# Parent  103efb7e16004273b642939c4f923f1223dcecdc
maint: Merge stable to default.

diff -r 131c5045fbd3 -r 4392386b5ecb Makefile.am
--- a/Makefile.am	Thu Mar 03 13:37:11 2022 +0900
+++ b/Makefile.am	Thu Mar 03 13:37:10 2022 -0500
@@ -225,7 +225,7 @@
 # Other directories are handled directly from this Makefile,
 # but also review the included module.mk makefile fragments.
 
-SUBDIRS = libgnu
+SUBDIRS = libgnu test
 
 # All of build depends on having libgnu.
 # Add the library to BUILT_SOURCES so it is created early in the build process
@@ -245,7 +245,6 @@
 include etc/module.mk
 include examples/module.mk
 include m4/module.mk
-include test/module.mk
 include build-aux/module.mk
 
 DIST_HOOKS := \
diff -r 131c5045fbd3 -r 4392386b5ecb configure.ac
--- a/configure.ac	Thu Mar 03 13:37:11 2022 +0900
+++ b/configure.ac	Thu Mar 03 13:37:10 2022 -0500
@@ -3101,6 +3101,7 @@
   build-aux/check-subst-vars.sh:build-aux/check-subst-vars.in.sh
   doc/doxyhtml/Doxyfile
   libgnu/Makefile
+  test/Makefile
   liboctave/octave.pc:liboctave/octave.in.pc
   libinterp/octinterp.pc:libinterp/octinterp.in.pc])
 
diff -r 131c5045fbd3 -r 4392386b5ecb test/bug-50831/module.mk
--- a/test/bug-50831/module.mk	Thu Mar 03 13:37:11 2022 +0900
+++ b/test/bug-50831/module.mk	Thu Mar 03 13:37:10 2022 -0500
@@ -1,4 +1,4 @@
 bug_50831_TEST_FILES = \
-  test/bug-50831/bug-50831.tst
+  %reldir%/bug-50831.tst
 
 TEST_FILES += $(bug_50831_TEST_FILES)
diff -r 131c5045fbd3 -r 4392386b5ecb test/mex/module.mk
--- a/test/mex/module.mk	Thu Mar 03 13:37:11 2022 +0900
+++ b/test/mex/module.mk	Thu Mar 03 13:37:10 2022 -0500
@@ -30,8 +30,9 @@
 
 ## And probably many others...
 MKOCTFILECPPFLAGS = \
+  -I$(top_builddir) \
   -I$(top_srcdir)/libinterp/corefcn \
-  -Ilibinterp/corefcn
+  -I$(top_builddir)/libinterp/corefcn
 MKOCTFILELDFLAGS = \
   -L$(top_builddir)/libinterp/.libs \
   -L$(top_builddir)/liboctave/.libs
@@ -41,8 +42,9 @@
   $(top_builddir)/src/mkoctfile $(MKOCTFILECPPFLAGS) $(MKOCTFILELDFLAGS)
 
 MKMEXFILECPPFLAGS = \
+  -I$(top_builddir) \
   -I$(top_srcdir)/libinterp/corefcn \
-  -Ilibinterp/corefcn
+  -I$(top_builddir)/libinterp/corefcn
 MKMEXFILELDFLAGS = \
   -L$(top_builddir)/libinterp/.libs \
   -L$(top_builddir)/liboctave/.libs