diff options
| -rw-r--r-- | Makefile.am | 22 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 13 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index f615857..f73f23e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,11 @@ bin_crontab_SOURCES = src/wrapper.c bin_crontab_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"crontab\"" bin_crontab_DEPENDENCIES = $(modules:.scm=.go) -dist_mcronmodule_DATA = \ +# Root directory used for installing Guile modules. +guilesitedir = $(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION) + +pkgmoduledir = $(guilesitedir)/$(PACKAGE) +dist_pkgmodule_DATA = \ src/mcron/base.scm \ src/mcron/environment.scm \ src/mcron/job-specifier.scm \ @@ -49,22 +53,22 @@ dist_mcronmodule_DATA = \ src/mcron/vixie-specification.scm \ src/mcron/vixie-time.scm -mcronmodule_DATA = \ - $(dist_mcronmodule_DATA:.scm=.go) \ +pkgmodule_DATA = \ + $(dist_pkgmodule_DATA:.scm=.go) \ src/mcron/config.scm \ src/mcron/config.go -mcronscriptdir = $(mcronmoduledir)/scripts -dist_mcronscript_DATA = \ +pkgscriptdir = $(pkgmoduledir)/scripts +dist_pkgscript_DATA = \ src/mcron/scripts/cron.scm \ src/mcron/scripts/crontab.scm \ src/mcron/scripts/mcron.scm -mcronscript_DATA = $(dist_mcronscript_DATA:.scm=.go) +pkgscript_DATA = $(dist_pkgscript_DATA:.scm=.go) modules = \ - $(dist_mcronmodule_DATA) \ - $(dist_mcronscript_DATA) \ + $(dist_pkgmodule_DATA) \ + $(dist_pkgscript_DATA) \ src/mcron/config.scm TEST_EXTENSIONS = .scm @@ -79,7 +83,7 @@ TESTS = \ tests/job-specifier.scm # Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if -# $GUILE_LOAD_COMPILED_PATH contains $(mcronmoduledir), we may find .go files +# $GUILE_LOAD_COMPILED_PATH contains $(pkgmoduledir), we may find .go files # in there that are newer than the local .scm files (for instance because the # user ran 'make install' recently). When that happens, we end up loading # those previously-installed .go files, which may be stale, thereby breaking diff --git a/configure.ac b/configure.ac index efb3fe1..8c5fc08 100644 --- a/configure.ac +++ b/configure.ac @@ -55,11 +55,6 @@ AM_PROG_CC_C_O # Check for Guile 2.x. development files GUILE_PKG([2.2 2.0]) -# Set directories for installed Guile modules -moduledir="${datarootdir}/guile/site/$GUILE_EFFECTIVE_VERSION" -AC_SUBST([moduledir]) -AC_SUBST([mcronmoduledir], ["${moduledir}/mcron"]) - # Set Guile flags without using GUILE_FLAGS which is requiring the unused # 'config.rpath' script. PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION]) |