From b944137b1fe3e2ba16f3942d14dc5e58d8dd28c6 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès
Date: Tue, 11 Dec 2007 17:07:18 +0100
Subject: Improve `(skribilo config)'.

* configure.ac: Don't generate `src/guile/skribilo/config.scm'; don't
  substitute `SKRIBILO_DOC_DIR', `SKRIBILO_EXT_DIR' and
  `SKRIBILO_SKR_PATH'.

* doc/modules/skribilo/documentation/env.scm (*courtes-mail*): Update.
  (*skribe-user-doc-url*, *skribe-dir-doc-url*): Update.

* src/guile/skribilo/Makefile.am (CLEANFILES, .in): New.
  Include `substitute.am'.

* src/guile/skribilo/config.scm.in: Overhauled.

* src/guile/skribilo/engine/context.scm: Use `skribilo-version' instead
  of `skribilo-release'.

* src/guile/skribilo/engine/lout.scm: Likewise.

* src/guile/skribilo/utils/compat.scm: Use `(skribilo config)'.
  (skribe-release, skribe-url, skribe-doc-dir, skribe-ext-dir,
  skribe-default-path, skribe-scheme): New.
---
 doc/modules/skribilo/documentation/env.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'doc/modules')

diff --git a/doc/modules/skribilo/documentation/env.scm b/doc/modules/skribilo/documentation/env.scm
index 569f194..6e31afa 100644
--- a/doc/modules/skribilo/documentation/env.scm
+++ b/doc/modules/skribilo/documentation/env.scm
@@ -1,7 +1,7 @@
 ;;; env.scm  --  The environment variables for the documentation.
 ;;;
+;;; Copyright 2005, 2006, 2007  Ludovic Court�s <ludo@gnu.org>
 ;;; Copyright 2003, 2004  Manuel Serrano
-;;; Copyright 2005, 2006  Ludovic Court�s <ludovic.courtes@laas.fr>
 ;;;
 ;;;
 ;;; This program is free software; you can redistribute it and/or modify
@@ -25,7 +25,7 @@
 
 (define-public *serrano-url* "http://www.inria.fr/mimosa/Manuel.Serrano")
 (define-public *serrano-mail* "Manuel.Serrano@sophia.inria.fr")
-(define-public *courtes-mail* "ludovic.courtes@laas.fr")
+(define-public *courtes-mail* "ludo@gnu.org")
 (define-public *html-url* "http://www.w3.org/TR/html4")
 (define-public *html-form* "interact/forms.html")
 (define-public *emacs-url* "http://www.gnu.org/software/emacs")
@@ -33,8 +33,11 @@
 (define-public *texinfo-url* "http://www.texinfo.org")
 (define-public *r5rs-url* "http://www.inria.fr/mimosa/fp/Bigloo/doc/r5rs.html")
 (define-public *bigloo-url* "http://www.inria.fr/mimosa/fp/Bigloo")
-(define-public *skribe-user-doc-url* (string-append (skribe-doc-dir) "/user.html"))
-(define-public *skribe-dir-doc-url* (string-append (skribe-doc-dir) "/dir.html"))
+
+(define-public *skribe-user-doc-url*
+  (string-append (skribilo-doc-directory) "/user.html"))
+(define-public *skribe-dir-doc-url*
+  (string-append (skribilo-doc-directory) "/dir.html"))
 
 (define-public *prgm-width* 97.)
 (define-public *prgm-skribe-color* "#ffffcc")
-- 
cgit v1.2.3