~ chicken-core (chicken-5) 42eb7a37c51591e4ea709260c380a391a849cf6d

commit 42eb7a37c51591e4ea709260c380a391a849cf6d
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 15:15:46 2010 +0200

    chicken-install fixes

diff --git a/chicken-install.scm b/chicken-install.scm
index 97367826..b14ca2eb 100644
--- a/chicken-install.scm
+++ b/chicken-install.scm
@@ -62,7 +62,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")))
@@ -101,9 +103,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)
@@ -117,11 +116,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
 			 ))