summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--doc/user/Makefile.am4
2 files changed, 16 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d3e667..c5b4c72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,20 @@
 # arch-tag: automatic-ChangeLog--lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2
 #
 
+2005-11-26 18:01:09 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-12
+
+    Summary:
+      Fixed the documentation's Makefile.am.
+    Revision:
+      skribilo--devel--1.2--patch-12
+
+    * doc/user/Makefile.am: Fixed GUILE_LOAD_PATH.
+    
+
+    modified files:
+     ChangeLog doc/user/Makefile.am
+
+
 2005-11-01 16:19:34 GMT	Ludovic Courtes <ludovic.courtes@laas.fr>	patch-11
 
     Summary:
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index 33d16ce..49026d5 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -4,7 +4,7 @@ skribilo = $(top_srcdir)/src/guile/skribilo.scm
 load_path = $(top_srcdir)/src/guile:$(top_srcdir)/src/guile/skribilo/package
 
 %.html: %.skb
-	GUILE_LOAD_PATH=$(load_path) \
+	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
 	$(skribilo) --target html -I ../ -o $@ $<
 
 if HAVE_LOUT
@@ -12,7 +12,7 @@ if HAVE_LOUT
 BUILT_SOURCES += user.ps
 
 %.lout: %.skb
-	GUILE_LOAD_PATH=$(load_path) \
+	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
 	$(skribilo) --target lout -I ../ -o $@ $<
 
 %.ps: %.lout