From 238a6ee02e730e148d84dbc7fac4b7a46140031f Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Fri, 20 Nov 2009 12:04:36 +0100
Subject: Define $GUILE_LOAD_COMPILED_PATH for Guile 2.x.

* guile-vm.am (guile_warnings): New variable.
  (.scm.go): Set $GUILE_LOAD_COMPILED_PATH appropriately, specify Guile
  compilation warnings.

* src/pre-inst-skribilo.in, src/skribilo.in: Set
  $GUILE_LOAD_COMPILED_PATH appropriately.

* tests/Makefile.am (TESTS_ENVIRONMENT): Set $GUILE_AUTO_COMPILE and
  $GUILE_LOAD_COMPILED_PATH.

* doc/user/Makefile.am (skribilo.info, .skb.html, .skb.lout, .skb.tex,
  .skb.ctx): Set $GUILE_LOAD_COMPILED_PATH.
  (load_compiled_path): New variable.
---
 doc/user/Makefile.am | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index 8039480..fb5cd4a 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -51,14 +51,19 @@ endif
 
 
 load_path = $(top_srcdir)/doc/modules
+load_compiled_path = $(top_builddir)/doc/modules
 
 
 skribilo.info: user.skb
-	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
+	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH	\
+	GUILE_LOAD_COMPILED_PATH=$(load_compiled_path):$$GUILE_LOAD_COMPILED_PATH \
+	GUILE_AUTO_COMPILE=0				\
 	$(skribilo) $(skrflags) --target=info -o $@ $<
 
 .skb.html:
-	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
+	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH	\
+	GUILE_LOAD_COMPILED_PATH=$(load_compiled_path):$$GUILE_LOAD_COMPILED_PATH \
+	GUILE_AUTO_COMPILE=0				\
 	$(skribilo) $(skrflags) --target=html -o $@ $<
 
 if HAVE_LOUT
@@ -93,15 +98,21 @@ if HAVE_PS2PDF
 endif
 
 .skb.lout:
-	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
+	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH	\
+	GUILE_LOAD_COMPILED_PATH=$(load_compiled_path):$$GUILE_LOAD_COMPILED_PATH \
+	GUILE_AUTO_COMPILE=0				\
 	$(skribilo) $(skrflags) --target=lout -o $@ $<
 
 .skb.tex:
-	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
+	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH	\
+	GUILE_LOAD_COMPILED_PATH=$(load_compiled_path):$$GUILE_LOAD_COMPILED_PATH \
+	GUILE_AUTO_COMPILE=0				\
 	$(skribilo) $(skrflags) --target=latex -o $@ $<
 
 .skb.ctx:
-	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
+	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH		\
+	GUILE_LOAD_COMPILED_PATH=$(load_compiled_path):$$GUILE_LOAD_COMPILED_PATH \
+	GUILE_AUTO_COMPILE=0					\
 	$(skribilo) $(skrflags) --target=context -o $@ $<
 
 
-- 
cgit v1.2.3