summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org>2019-12-06 11:51:55 +0200
committerSergey Poznyakoff <gray@gnu.org>2019-12-06 11:51:55 +0200
commitf1614e7c34bb22c374c234e7c9565b4ef628bd5b (patch)
tree611c108920474c01f22bab1e1ac3730e692d55be /testsuite
parentccb68a69450766276b0a23397197f4ec8b060145 (diff)
downloadmailutils-libadd-cleanup.tar.gz
mailutils-libadd-cleanup.tar.bz2
Build package.m4 in Makefilelibadd-cleanup
The decision to build package.m4 in config.status makes proper maintenance of the file problematic. It is reverted. This patch also uses colon-separated VPATH for compatibility with other make implementations. * configure.ac: Don't build package.m4 * testsuite/Makefile.am: Do it here. * libmailutils/tests/Makefile.am: Use colon-separated VPATH for compatibility with BSD make. * testsuite/package.m4.in: Remove.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/Makefile.am16
-rw-r--r--testsuite/package.m4.in6
2 files changed, 14 insertions, 8 deletions
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 432c36a04..4ac273d22 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -16,10 +16,8 @@
include $(srcdir)/testsuite.am
-DISTCLEANFILES += package.m4
EXTRA_DIST += \
package.m4 \
- package.m4.in \
testsuite.inc\
testsuite.am\
lib\
@@ -29,6 +27,20 @@ EXTRA_DIST += \
maildir\
mh
+## ------------ ##
+## package.m4. ##
+## ------------ ##
+
+$(srcdir)/package.m4: $(top_srcdir)/configure.ac
+ $(AM_V_GEN){ \
+ echo '# Signature of the current package.'; \
+ echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \
+ echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \
+ echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \
+ echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \
+ echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
+ } >$(srcdir)/package.m4
+
## -------------------------- ##
## Non-installable programs
## -------------------------- ##
diff --git a/testsuite/package.m4.in b/testsuite/package.m4.in
deleted file mode 100644
index a9bd74a90..000000000
--- a/testsuite/package.m4.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# Signature of the current package.
-m4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])
-m4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])
-m4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])
-m4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])
-m4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])

Return to:

Send suggestions and report system problems to the System administrator.