summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-02-20 11:02:32 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-02-20 11:14:12 +0000
commit5ff2a6e43a071a687ad5b4967dbb2274eceb1d89 (patch)
treec3edd929e55c5ae0e69bf387adbf87cba805b08a
parent68c2043fbd32b3e07dd96a4b408dbc1c64aea838 (diff)
downloadm4-5ff2a6e43a071a687ad5b4967dbb2274eceb1d89.tar.gz
Makefile.am: hack to override sanity check
automake will check whether it is sensible to install certain files to certain destinations. LTLIBRARIES are usually installed to a library directory, libexec is usually for programs that are run by the main program. M4 wants to install libtool libraries into libexec, presumably for some kind of plugin support, or just as private libraries. To override the sanity check we can define a new destination as the same as the old one with a new name, as described in http://www.gnu.org/software/automake/manual/html_node/Uniform.html
-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": [