From 624ceb44809f2be891f0af82df1d917d4a5aa9c1 Mon Sep 17 00:00:00 2001 From: Mathieu Lirzin Date: Tue, 20 Mar 2018 00:57:02 +0100 Subject: build: Properly set Guile load paths in programs This fixes an issue where the installed Guile load paths were set by the undefined 'moduledir' Make macro. * Makefile.am (AM_CPPFLAGS): Define PACKAGE_LOAD_PATH with 'guilesitedir' macro and PACKAGE_LOAD_COMPILED_PATH with 'guilesitegodir'. * NEWS: Update. --- Makefile.am | 4 ++-- NEWS | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 96b67c1..6a01ec9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,8 +31,8 @@ noinst_PROGRAMS = bin/cron bin/crontab endif AM_CPPFLAGS = \ - -DPACKAGE_LOAD_PATH=\"$(moduledir)\" \ - -DPACKAGE_LOAD_COMPILED_PATH=\"$(moduledir)\" \ + -DPACKAGE_LOAD_PATH=\"$(guilesitedir)\" \ + -DPACKAGE_LOAD_COMPILED_PATH=\"$(guilesitegodir)\" \ -D_GNU_SOURCE AM_CFLAGS = @GUILE_CFLAGS@ diff --git a/NEWS b/NEWS index 7cbf969..a5f2c80 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,9 @@ GNU Mcron NEWS -*- outline -*- The "--disable-multi-user" configure variable is not reversed anymore. 'cron' and 'crontab' are now installed unless this option is used. + The programs now sets the GUILE_LOAD_PATH and GUILE_LOAD_COMPILED_PATH + environment variables with the location of the installed Guile modules. + * Noteworthy changes in release 1.1 (2018-03-19) [stable] ** New features -- cgit v1.2.3