summary refs log tree commit diff
path: root/doc/user
diff options
context:
space:
mode:
authorLudovic Courtès2007-11-28 13:57:06 +0100
committerLudovic Courtès2007-11-28 13:57:06 +0100
commit125baac85e912aaa45cd250d9254ab5f890f7058 (patch)
treef2ec9bb0aaa4ab5a14e7d5e32c4fabbbd6fd6473 /doc/user
parent9d11a119ec7aec9db96caa1d80879b38da3a9950 (diff)
downloadskribilo-125baac85e912aaa45cd250d9254ab5f890f7058.tar.gz
skribilo-125baac85e912aaa45cd250d9254ab5f890f7058.tar.lz
skribilo-125baac85e912aaa45cd250d9254ab5f890f7058.zip
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)".
Diffstat (limited to 'doc/user')
-rw-r--r--doc/user/Makefile.am5
1 files changed, 3 insertions, 2 deletions
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 $@ $<