From 125baac85e912aaa45cd250d9254ab5f890f7058 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Wed, 28 Nov 2007 13:57:06 +0100
Subject: Add run-time module with fewer bindings; add `--compat' command-line
 option.

* doc/user/Makefile.am (skrflags): New.  Use `--compat=skribe' for now.

* src/guile/Makefile.am (moduledir): New.
  (dist_guilemodule_DATA): Renamed to...
  (dist_module_DATA): This, for consistency.

* src/guile/skribilo.scm (skribilo-options): Add `--compat'.
  (doskribe): New COMPAT argument.
  (skribilo): Honor `--compat'.

* src/guile/skribilo/module.scm (%skribilo-user-imports): New.
  (make-run-time-module): Renamed to `make-skribe-user-module'.
  (make-skribilo-user-module): New.
  (make-user-module, user-module-flavor): New.
  (*skribilo-user-module*): Default to a `skribilo' module flavor.

* src/guile/skribilo/package/diff.scm (make-diff-document-from-files):
  Use "(make-user-module 'skribilo)".
---
 doc/user/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'doc/user/Makefile.am')

diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am
index 0501ff6..11dad13 100644
--- a/doc/user/Makefile.am
+++ b/doc/user/Makefile.am
@@ -12,12 +12,13 @@ BUILT_SOURCES = doc-config.scm
 html_DATA = user.html
 
 skribilo = $(top_builddir)/src/pre-inst-skribilo
+skrflags = -I ../ -P ../img --compat=skribe
 load_path = $(top_srcdir)/src/guile:$(top_srcdir)/src/guile/skribilo/package:$(top_builddir)/src/guile:$(top_srcdir)/doc/modules
 
 
 %.html: %.skb
 	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
-	$(skribilo) --target html -I ../ -P ../img -o $@ $<
+	$(skribilo) $(skrflags) --target html -o $@ $<
 
 if HAVE_LOUT
 
@@ -25,7 +26,7 @@ ps_DATA = user.ps
 
 %.lout: %.skb
 	GUILE_LOAD_PATH=$(load_path):$$GUILE_LOAD_PATH \
-	$(skribilo) --target lout -I ../ -P ../img -o $@ $<
+	$(skribilo) $(skrflags) --target lout -o $@ $<
 
 %.ps: %.lout
 	$(LOUT) -c $(<:%.lout=%) -o $@ $<
-- 
cgit v1.2.3