diff options
author | Gary V. Vaughan <gary@gnu.org> | 2013-09-15 17:51:25 +0700 |
---|---|---|
committer | Gary V. Vaughan <gary@gnu.org> | 2013-09-15 21:17:13 +0700 |
commit | 4b680592787adc2c3dcd0f56d3cb0aada7590430 (patch) | |
tree | c23230f815364b4c5d4479f076a0768acd10b465 | |
parent | 6acfba742fe0ec50cf76903f442eac7a19638ece (diff) | |
download | m4-4b680592787adc2c3dcd0f56d3cb0aada7590430.tar.gz |
configury: don't install modules to pkglibexecdir.
Modern Automake (correctly) errors out when trying to install
modules to pkglibexecdir; we should be using pkglibdir here.
* Makefile.am (pkglibexec_LTLIBRARIES): Rename from this...
(pkglib_LTLIBRARIES): ...to this.
Signed-off-by: Gary V. Vaughan <gary@gnu.org>
-rw-r--r-- | Changelog | 6 | ||||
-rw-r--r-- | Makefile.am | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,5 +1,11 @@ 2013-09-15 Gary V. Vaughan <gary@gnu.org> + configury: don't install modules to pkglibexecdir. + Modern Automake (correctly) oerrors out when trying to install + modules to pkglibexecdir; we should be using pkglibdir here. + * Makefile.am (pkglibexec_LTLIBRARIES): Rename from this... + (pkglib_LTLIBRARIES): ...to this. + bootstrap: sync with upstream. * bootstrap.conf: New file. * gl/build-aux/bootstrap.in, gl/build-aux/extract-trace, diff --git a/Makefile.am b/Makefile.am index 16e2be9e..ad48ada1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -149,7 +149,7 @@ module_libadd = m4/libm4.la pkgmodinclude_HEADERS = modules/m4.h -pkglibexec_LTLIBRARIES = \ +pkglib_LTLIBRARIES = \ modules/gnu.la \ modules/load.la \ modules/m4.la \ @@ -172,14 +172,14 @@ modules_traditional_la_LDFLAGS = $(module_ldflags) modules_traditional_la_LIBADD = $(module_libadd) if USE_GMP -pkglibexec_LTLIBRARIES += modules/mpeval.la +pkglib_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) endif ## Disabled for now. It is too fragile to be useful. -## pkglibexec_LTLIBRARIES += modules/perl.la +## pkglib_LTLIBRARIES += modules/perl.la ## modules_perl_la_CPPFLAGS = `$(PERL) -MExtUtils::Embed -e ccopts` ## modules_perl_la_LDFLAGS = \ ## $(module_ldflags) `$(PERL) -MExtUtils::Embed -e ldopts` |