summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am7
-rw-r--r--m4.morph2
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 16e2be9e..b3623ac1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,10 @@ module_libadd = m4/libm4.la
pkgmodinclude_HEADERS = modules/m4.h
-pkglibexec_LTLIBRARIES = \
+# dirty hack to disable automake's sanity checks on what is allowed to
+# be installed where
+my_pkglibexecdir = $(pkglibexecdir)
+my_pkglibexec_LTLIBRARIES = \
modules/gnu.la \
modules/load.la \
modules/m4.la \
@@ -172,7 +175,7 @@ modules_traditional_la_LDFLAGS = $(module_ldflags)
modules_traditional_la_LIBADD = $(module_libadd)
if USE_GMP
-pkglibexec_LTLIBRARIES += modules/mpeval.la
+my_pkglibexec_LTLIBRARIES += modules/mpeval.la
EXTRA_modules_mpeval_la_SOURCES = modules/evalparse.c
modules_mpeval_la_LDFLAGS = $(module_ldflags)
modules_mpeval_la_LIBADD = $(module_libadd) $(LIBADD_GMP)
diff --git a/m4.morph b/m4.morph
index e83420aa..2c35238c 100644
--- a/m4.morph
+++ b/m4.morph
@@ -3,7 +3,7 @@
"kind": "chunk",
"configure-commands": [
"rm .git*",
- "CONFIG_SHELL=\"/bin/bash\" bash -ex bootstrap --skip-po",
+ "CONFIG_SHELL=\"/bin/bash\" bash bootstrap --skip-po",
"./configure --prefix=/usr --disable-nls"
],
"build-commands": [