AboutSummaryRefsLogTreeCommitDiffStats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac4
-rw-r--r--src/mcron.c1
3 files changed, 5 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index ddb1c26..d01e730 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,19 +19,20 @@
bin_PROGRAMS = mcron crontab
sbin_PROGRAMS = cron
+AM_CPPFLAGS = -DPACKAGE_LOAD_PATH=\"$(moduledir)\"
AM_CFLAGS = @GUILE_CFLAGS@
LDADD = @GUILE_LIBS@
mcron_SOURCES = src/mcron.c
-mcron_CPPFLAGS = -DPROGRAM="\"mcron\""
+mcron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"mcron\""
mcron_DEPENDENCIES = $(modules:%.scm=%.go)
cron_SOURCES = src/mcron.c
-cron_CPPFLAGS = -DPROGRAM="\"cron\""
+cron_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"cron\""
cron_DEPENDENCIES = $(modules:%.scm=%.go)
crontab_SOURCES = src/mcron.c
-crontab_CPPFLAGS = -DPROGRAM="\"crontab\""
+crontab_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"crontab\""
crontab_DEPENDENCIES = $(modules:%.scm=%.go)
dist_mcronmodule_DATA = \
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],
diff --git a/src/mcron.c b/src/mcron.c
index 026b077..a52c073 100644
--- a/src/mcron.c
+++ b/src/mcron.c
@@ -22,7 +22,6 @@
is needed because the crontab personality requires SUID which is not
permitted for executable scripts. */
-#include "config.h"
#include <libguile.h>
#include <signal.h>
#include <stdlib.h>