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.
This commit is contained in:
Mathieu Lirzin 2016-07-17 00:10:35 +02:00
commit 245413041c
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
3 changed files with 5 additions and 7 deletions

View file

@ -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],