dmbcs/mcron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Rename variables for Guile install directories.

Browse source 
* configure.ac (moduledir, mcronmoduledir): Rename to ...
* Makefile.am (guilesitedir, pkgmoduledir): ... these.
(dist_mcronmodule_DATA, mcronmodule_DATA, mcronscriptdir)
(dist_mcronscript_DATA, mcronscript_DATA): Rename to ...
(dist_pkgmodule_DATA, pkgmodule_DATA, pkgscriptdir, dist_pkgscript_DATA)
(pkgscript_DATA): ... these.
(modules): Adapt.
This commit is contained in:
Mathieu Lirzin 2017-01-14 17:51:58 +01:00
commit c2cdfefaca
No known key found for this signature in database
GPG key ID: 0ADEE10094604D37
2 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Makefile.am
View file

@ -40,7 +40,11 @@ bin_crontab_SOURCES = src/wrapper.c
bin_crontab_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"crontab\"" bin_crontab_CPPFLAGS = $(AM_CPPFLAGS) -DPROGRAM="\"crontab\""
bin_crontab_DEPENDENCIES = $(modules:.scm=.go) 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/base.scm \
src/mcron/environment.scm \ src/mcron/environment.scm \
src/mcron/job-specifier.scm \ src/mcron/job-specifier.scm \
@ -49,22 +53,22 @@ dist_mcronmodule_DATA = \
src/mcron/vixie-specification.scm \ src/mcron/vixie-specification.scm \
src/mcron/vixie-time.scm src/mcron/vixie-time.scm
mcronmodule_DATA = \ pkgmodule_DATA = \
$(dist_mcronmodule_DATA:.scm=.go) \ $(dist_pkgmodule_DATA:.scm=.go) \
src/mcron/config.scm \ src/mcron/config.scm \
src/mcron/config.go src/mcron/config.go
mcronscriptdir = $(mcronmoduledir)/scripts pkgscriptdir = $(pkgmoduledir)/scripts
dist_mcronscript_DATA = \ dist_pkgscript_DATA = \
src/mcron/scripts/cron.scm \ src/mcron/scripts/cron.scm \
src/mcron/scripts/crontab.scm \ src/mcron/scripts/crontab.scm \
src/mcron/scripts/mcron.scm src/mcron/scripts/mcron.scm
mcronscript_DATA = $(dist_mcronscript_DATA:.scm=.go) pkgscript_DATA = $(dist_pkgscript_DATA:.scm=.go)
modules = \ modules = \
$(dist_mcronmodule_DATA) \ $(dist_pkgmodule_DATA) \
$(dist_mcronscript_DATA) \ $(dist_pkgscript_DATA) \
src/mcron/config.scm src/mcron/config.scm
TEST_EXTENSIONS = .scm TEST_EXTENSIONS = .scm
@ -79,7 +83,7 @@ TESTS = \
tests/job-specifier.scm tests/job-specifier.scm
# Unset 'GUILE_LOAD_COMPILED_PATH' altogether while compiling. Otherwise, if # 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 # 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 # user ran 'make install' recently). When that happens, we end up loading
# those previously-installed .go files, which may be stale, thereby breaking # those previously-installed .go files, which may be stale, thereby breaking

5
configure.ac
View file

@ -55,11 +55,6 @@ AM_PROG_CC_C_O
# Check for Guile 2.x. development files # Check for Guile 2.x. development files
GUILE_PKG([2.2 2.0]) 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 # Set Guile flags without using GUILE_FLAGS which is requiring the unused
# 'config.rpath' script. # 'config.rpath' script.
PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION]) PKG_CHECK_MODULES(GUILE, [guile-$GUILE_EFFECTIVE_VERSION])