diff options
| author | Mathieu Lirzin <mthl@gnu.org> | 2016-07-17 00:10:35 +0200 |
|---|---|---|
| committer | Mathieu Lirzin <mthl@gnu.org> | 2016-12-01 00:15:56 +0100 |
| commit | 245413041c1ddee4bb7d752f6f1044750b887df8 (patch) | |
| tree | 999280db336c070f17d92093d36225c01b05e40f /configure.ac | |
| parent | 6a82b53ddd8cb93f60121cb02e1276e089926ad1 (diff) | |
| download | mcron-245413041c1ddee4bb7d752f6f1044750b887df8.tar.gz mcron-245413041c1ddee4bb7d752f6f1044750b887df8.tar.bz2 mcron-245413041c1ddee4bb7d752f6f1044750b887df8.zip | |
build: Define PACKAGE_LOAD_PATH in Makefile.
Previously PACKAGE_LOAD_PATH was set in config header which wasn't correctly
expanded due to the presence of ${prefix} in ${moduledir}. Let 'make' handle
the expansion.
* Makefile.am (AM_CPPFLAGS): New variable.
(cron_CPPFLAGS, crontab_CPPFLAGS, mcron_CPPFLAGS): Use it.
* configure.ac (PACKAGE_LOAD_PATH): Undefine it.
(AC_CONFIG_HEADER): Remove macro.
* src/mcron.c: Adapt to it.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index da860f9..5ec29aa 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,6 @@ AC_PREREQ(2.61) AC_INIT([GNU Mcron], [1.0.8], [bug-mcron@gnu.org]) -AC_CONFIG_HEADER([src/config.h]) AC_CONFIG_SRCDIR([src/mcron.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_REQUIRE_AUX_FILE([test-driver.scm]) @@ -31,9 +30,8 @@ AM_INIT_AUTOMAKE([subdir-objects -Wall -Wno-override]) AM_SILENT_RULES([yes]) # enables silent rules by default moduledir="${datarootdir}/guile/site/2.0" +AC_SUBST([moduledir]) AC_SUBST([mcronmoduledir], ["${moduledir}/mcron"]) -AC_DEFINE_UNQUOTED([PACKAGE_LOAD_PATH], ["${moduledir}"], - [Define to the guile modules location of this package.]) AC_MSG_CHECKING([whether debugging is requested]) AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], |