build: Support VPATH builds.

This allows using 'mcron' before it is installed without hardcoding the
local build environment in the executable.

* build-aux/pre-inst-env.in: New script.
* configure.ac (AC_CONFIG_FILES): Create it.
(AC_CONFIG_HEADER): Add 'config.h'.
(moduledir): New variable.
(PACKAGE_LOAD_PATH): new C preprocessor macro.
* mcron.c: Include "config.h".
(main): Don't overwrite Guile load paths.
(inner_main): Prepend Mcron modules load paths.
* Makefile.am (.scm.go, doc/mcron.1): Use 'pre-inst-env'.
(mcron_CFLAGS): Remove GUILE_LOAD_PATH macro.
(noinst_SCRIPTS): New variable.
* .gitignore: Update.
This commit is contained in:
Mathieu Lirzin 2015-10-17 20:05:08 +02:00
commit 8952d2dc44
5 changed files with 59 additions and 7 deletions

View file

@ -18,7 +18,7 @@
bin_PROGRAMS = mcron
mcron_SOURCES = mcron.c
mcron_CFLAGS = @GUILE_CFLAGS@ -DGUILE_LOAD_PATH=\"$(datadir):./scm:...\"
mcron_CFLAGS = @GUILE_CFLAGS@
mcron_DEPENDENCIES = $(GOBJECTS) # Build Guile modules before linking.
mcron_LDADD = @GUILE_LIBS@
@ -65,13 +65,14 @@ dist_mcronmodule_DATA = \
$(AM_V_GUILEC)$(MKDIR_P) `dirname "$@"` ; \
unset GUILE_LOAD_COMPILED_PATH ; \
LC_ALL=C \
$(GUILD) compile \
$(top_builddir)/pre-inst-env $(GUILD) compile \
--load-path="$(top_builddir)/scm" \
--load-path="$(top_srcdir)/scm" \
--warn=format --warn=unbound-variable --warn=arity-mismatch \
--target="$(host)" --output="$@" "$<"
SUFFIXES = .go
noinst_SCRIPTS = pre-inst-env
dist-hook: gen-ChangeLog
@ -128,7 +129,7 @@ dist_man_MANS = doc/mcron.1
# elemental man page. Will only work once the mcron program is installed.
doc/mcron.1: mcron.c
-$(AM_V_HELP2MAN)$(MKDIR_P) `dirname "$@"` ; \
$(HELP2MAN) \
$(top_builddir)/pre-inst-env $(HELP2MAN) \
-n 'a program to run tasks at regular (or not) intervals' \
./mcron > $@