diff options
| author | Ludovic Courtès | 2008-01-22 17:27:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès | 2008-01-22 17:27:37 +0100 |
| commit | ffd3ed37343917e87d27acb38a377686e866d741 (patch) | |
| tree | 9015e7f525cace5f818050e2fa829875cb021e97 | |
| parent | afc4870d9d13c217cfbbff2c68fa658fb3ef274e (diff) | |
| download | skribilo-ffd3ed37343917e87d27acb38a377686e866d741.tar.gz skribilo-ffd3ed37343917e87d27acb38a377686e866d741.tar.lz skribilo-ffd3ed37343917e87d27acb38a377686e866d741.zip | |
doc: Remove need to `doc-config.scm'.
* doc/user/Makefile.am (BUILT_SOURCES): Remove.
(skrflags): Define `%have-ploticus?' and `%ploticus-path' using `-e'.
(doc-config.scm): Remove.
* doc/user/user.skb: Don't load `doc-config.scm'.
| -rw-r--r-- | doc/user/Makefile.am | 20 | ||||
| -rw-r--r-- | doc/user/user.skb | 3 |
2 files changed, 10 insertions, 13 deletions
diff --git a/doc/user/Makefile.am b/doc/user/Makefile.am index 4f0e16f..014e315 100644 --- a/doc/user/Makefile.am +++ b/doc/user/Makefile.am @@ -23,7 +23,6 @@ EXTRA_DIST += src/api1.skb \ src/start3.skb src/start4.skb src/start5.skb -BUILT_SOURCES = doc-config.scm html_DATA = user.html dist_html_DATA = skribilo.css CLEANFILES = $(BUILT_SOURCES) $(html_DATA) @@ -35,6 +34,16 @@ skrflags = -I $(srcdir) -P $(top_srcdir)/doc/img \ -e '(define %top-srcdir "$(top_srcdir)")' \ -e '(define %top-builddir "$(top_builddir)")' skrflags += --compat=skribe + +if HAVE_PLOTICUS +skrflags += -e "(define %have-ploticus? (= 1 1))" \ + -e "(define %ploticus-path \"$(PLOTICUS)\")" +else +skrflags += -e "(define %have-ploticus? (= 0 1))" \ + -e "(define %ploticus-path (= 0 1))" +endif + + load_path = $(top_srcdir)/doc/modules @@ -68,15 +77,6 @@ if HAVE_PS2PDF $(PS2PDF) $(@:%.pdf=%.ps) endif -if HAVE_PLOTICUS -doc-config.scm: - echo "(define %have-ploticus? #t)" > $@ - echo "(define %ploticus-path \"$(PLOTICUS)\")" >> $@ -else -doc-config.scm: - echo "(define %have-ploticus? #f) (define %ploticus-path #f)" > $@ -endif - # Install/uninstall files not listed in `html_DATA'. install-data-hook: diff --git a/doc/user/user.skb b/doc/user/user.skb index a360fbd..9300e75 100644 --- a/doc/user/user.skb +++ b/doc/user/user.skb @@ -35,9 +35,6 @@ (skribilo package slide) (skribilo package web-book2)) -;; Load the compile-time configuration file. -(load "doc-config.scm") - (if %have-ploticus? (set! %ploticus-program %ploticus-path)) ;; Modules needed, e.g., to get the output of "skribilo-config --help". |