~ chicken-core (chicken-5) 1120935c0828cc8767f88ebc91f6803b19d4b1fe
commit 1120935c0828cc8767f88ebc91f6803b19d4b1fe
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Wed Jul 28 14:49:59 2010 +0200
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Wed Jul 28 14:49:59 2010 +0200
chicken-install fixes
diff --git a/chicken-install.scm b/chicken-install.scm
index 37f75b1a..69ca8b9f 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -61,7 +61,9 @@
"irregex.import.so"
"types.db"))
- (define-constant +setup.defaults-version+ 1)
+ (define-constant +defaults-version+ 1)
+ (define-constant +module-db+ "modules.db")
+ (define-constant +defaults-file+ "setup.defaults")
(define *program-path*
(or (and-let* ((p (get-environment-variable "CHICKEN_PREFIX")))
@@ -100,9 +102,6 @@
(foreign-value "C_TARGET_PREFIX" c-string)))
(else *prefix*)))
- (define-constant +module-db+ "modules.db")
- (define-constant +defaults-file+ "setup.defaults")
-
(define (load-defaults)
(let ((deff (make-pathname (chicken-home) +defaults-file+)))
(define (broken x)
@@ -116,11 +115,12 @@
(case (car x)
((version)
(cond ((not (pair? (cdr x))) (broken x))
- ((not (= (cadr x) +setup.defaults-version+))
+ ((not (= (cadr x) +defaults-version+))
(error
(sprintf
- "version of installed `setup.defaults' does not match setup-API version (~a)"
- +setup.default-version+)
+ "version of installed `~a' does not match setup-API version (~a)"
+ +defaults-file+
+ +defaults-version+)
(cadr x)))
;; ignored
))
Trap