summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorLudovic Courtes2005-12-04 21:23:37 +0000
committerLudovic Courtes2005-12-04 21:23:37 +0000
commit5113d97ba18980899c573387bdfdc6a086ef332f (patch)
tree0e9e8ed316ed3a4a996b3a42c769282eb842c7bd /doc
parentc4c942f265f9cd7730155ecb978eb1b98051e764 (diff)
parent9d4199ce1494a0c2a328fa51424acc29ae9dc91f (diff)
downloadskribilo-5113d97ba18980899c573387bdfdc6a086ef332f.tar.gz
skribilo-5113d97ba18980899c573387bdfdc6a086ef332f.tar.lz
skribilo-5113d97ba18980899c573387bdfdc6a086ef332f.zip
Merge from lcourtes@laas.fr--2005-mobile
Patches applied:

 * lcourtes@laas.fr--2005-mobile/skribilo--devel--1.2  (patch 12-14)

   - Fixed the documentation's Makefile.am.
   - Merge from lcourtes@laas.fr--2004-libre

git-archimport-id: lcourtes@laas.fr--2004-libre/skribilo--devel--1.2--patch-17
Diffstat (limited to 'doc')
-rw-r--r--doc/user/Makefile.am4
1 files changed, 2 insertions, 2 deletions
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