diff options
| author | Ludovic Courtès | 2007-12-13 15:55:58 +0100 |
|---|---|---|
| committer | Ludovic Courtès | 2007-12-13 15:55:58 +0100 |
| commit | b38a4b43a6ac84df4e8d09d8dae803927cc68e9d (patch) | |
| tree | bb81e913b76419acd3b5bc74ac6367e06b77962b /emacs | |
| parent | eeb11b1464537651f88aa15171e83261c2257402 (diff) | |
| download | skribilo-b38a4b43a6ac84df4e8d09d8dae803927cc68e9d.tar.gz skribilo-b38a4b43a6ac84df4e8d09d8dae803927cc68e9d.tar.lz skribilo-b38a4b43a6ac84df4e8d09d8dae803927cc68e9d.zip | |
Perform proper substitution in `skribe.el'.
* emacs/Makefile.am (EXTRA_DIST, lisp_DATA, CLEANFILES): New.
(dist_lisp_DATA): Remove.
(.in): New. Include `substitute.am'.
* emacs/skribe.el: Remove.
* emacs/skribe.el.in (skribe-version): Use `@PACKAGE_VERSION@'.
(skribe-emacs-dir): Use `@lispdir@'.
(skribe-docdirs): Use `@docdir@'.
(skribe-host-scheme-docdirs): Use Guile's URL.
* substitute.am: Substitute `$(lispdir)'.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/Makefile.am | 11 | ||||
| -rw-r--r-- | emacs/skribe.el | 8 | ||||
| -rw-r--r-- | emacs/skribe.el.in | 8 |
3 files changed, 18 insertions, 9 deletions
diff --git a/emacs/Makefile.am b/emacs/Makefile.am index d3cdcf2..85084df 100644 --- a/emacs/Makefile.am +++ b/emacs/Makefile.am @@ -1 +1,10 @@ -dist_lisp_DATA = skribe.el +EXTRA_DIST = skribe.el.in +lisp_DATA = skribe.el + +CLEANFILES = $(lisp_DATA) + +include $(top_srcdir)/substitute.am + +.in: + $(substitute) "$^" > "$@.tmp" && \ + mv "$@.tmp" "$@" diff --git a/emacs/skribe.el b/emacs/skribe.el index 6c4563a..23e0e40 100644 --- a/emacs/skribe.el +++ b/emacs/skribe.el @@ -25,7 +25,7 @@ ;* custom */ ;*---------------------------------------------------------------------*/ ;; skribe version -(defconst skribe-version "1.2d" +(defconst skribe-version "0.9.0" "*The Skribe version.") ;; skribe group @@ -36,19 +36,19 @@ :group 'processes) ;; emacs directory -(defcustom skribe-emacs-dir '"/users/serrano/emacs/site-lisp/bigloo" +(defcustom skribe-emacs-dir '"/usr/local/share/emacs/site-lisp" "*Directory for Skribe Emacs installation." :group 'skribe :type '(string)) ;; additional directories for online documentation -(defcustom skribe-docdirs '("/usr/local/doc/skribe-1.2d") +(defcustom skribe-docdirs '("/usr/local/share/doc/skribilo") "*Directories for online documentation." :group 'skribe :type '(repeat (string))) ;; Host scheme documentation -(defcustom skribe-host-scheme-docdirs '("/users/serrano/prgm/project/bigloo/manuals") +(defcustom skribe-host-scheme-docdirs '("http://www.gnu.org/software/guile/") "*URL for hosting Scheme system." :group 'skribe :type '(string)) diff --git a/emacs/skribe.el.in b/emacs/skribe.el.in index 1b1ae4f..e324f0d 100644 --- a/emacs/skribe.el.in +++ b/emacs/skribe.el.in @@ -25,7 +25,7 @@ ;* custom */ ;*---------------------------------------------------------------------*/ ;; skribe version -(defconst skribe-version "@SKRIBE_RELEASE@" +(defconst skribe-version "@PACKAGE_VERSION@" "*The Skribe version.") ;; skribe group @@ -36,19 +36,19 @@ :group 'processes) ;; emacs directory -(defcustom skribe-emacs-dir '"@SKRIBE_EMACSDIR@" +(defcustom skribe-emacs-dir '"@lispdir@" "*Directory for Skribe Emacs installation." :group 'skribe :type '(string)) ;; additional directories for online documentation -(defcustom skribe-docdirs '("@SKRIBE_DOCDIR@") +(defcustom skribe-docdirs '("@docdir@") "*Directories for online documentation." :group 'skribe :type '(repeat (string))) ;; Host scheme documentation -(defcustom skribe-host-scheme-docdirs '("@SKRIBE_HOSTSCHEMEDOCDIR@") +(defcustom skribe-host-scheme-docdirs '("http://www.gnu.org/software/guile/") "*URL for hosting Scheme system." :group 'skribe :type '(string)) |