Import Debian changes 3a2-3debian/3a2-3

slib (3a2-3) unstable; urgency=low

  * Brought all source files up-to-date with upstream CVS.
  Repeat changes from version 3a2-1 in Makefile.

1 files changed, 21 insertions, 21 deletions

diff --git a/vscm.init b/vscm.init
index 5bfd8fb..cd9e0c4 100644
--- a/vscm.init
+++ b/vscm.init
@@ -36,7 +36,7 @@
 
 ;;; (software-type) should be set to the generic operating system type.
 ;;; UNIX, VMS, MACOS, AMIGA and MS-DOS are supported.
-(define (software-type) 'UNIX)
+(define (software-type) 'unix)
 
 ;;; (scheme-implementation-type) should return the name of the scheme
 ;;; implementation loading this file.
@@ -57,9 +57,9 @@
 ;;; implementation reside.
 (define (implementation-vicinity)
   (case (software-type)
-    ((UNIX)	 "/usr/local/src/scheme/")
-    ((VMS)	"scheme$src:")
-    ((MS-DOS)	"C:\\scheme\\")))
+    ((unix)	 "/usr/local/src/scheme/")
+    ((vms)	"scheme$src:")
+    ((ms-dos)	"C:\\scheme\\")))
 
 ;;; (library-vicinity) should be defined to be the pathname of the
 ;;; directory where files of Scheme library functions reside.
@@ -68,9 +68,9 @@
 	 (or (getenv "SCHEME_LIBRARY_PATH")
 	     ;; Uses this path if SCHEME_LIBRARY_PATH is not set.
 	     (case (software-type)
-	       ((UNIX) "/usr/local/lib/slib/")
-	       ((VMS) "lib$scheme:")
-	       ((MS-DOS) "C:\\SLIB\\")
+	       ((unix) "/usr/local/lib/slib/")
+	       ((vms) "lib$scheme:")
+	       ((ms-dos) "C:\\SLIB\\")
 	       (else "")))))
     (lambda () library-path)))
 
@@ -81,7 +81,7 @@
   (let ((home (getenv "HOME")))
     (and home
 	 (case (software-type)
-	   ((UNIX COHERENT MS-DOS)	;V7 unix has a / on HOME
+	   ((unix coherent ms-dos)	;V7 unix has a / on HOME
 	    (if (eqv? #\/ (string-ref home (+ -1 (string-length home))))
 		home
 		(string-append home "/")))
@@ -91,7 +91,7 @@
 ;@
 (define (user-vicinity)
   (case (software-type)
-    ((VMS)	"[.]")
+    ((vms)	"[.]")
     (else	"")))
 
 (define *load-pathname* #f)
@@ -99,12 +99,12 @@
 (define vicinity:suffix?
   (let ((suffi
 	 (case (software-type)
-	   ((AMIGA)				'(#\: #\/))
-	   ((MACOS THINKC)			'(#\:))
-	   ((MS-DOS WINDOWS ATARIST OS/2)	'(#\\ #\/))
-	   ((NOSVE)				'(#\: #\.))
-	   ((UNIX COHERENT PLAN9)		'(#\/))
-	   ((VMS)				'(#\: #\]))
+	   ((amiga)				'(#\: #\/))
+	   ((macos thinkc)			'(#\:))
+	   ((ms-dos windows atarist os/2)	'(#\\ #\/))
+	   ((nosve)				'(#\: #\.))
+	   ((unix coherent plan9)		'(#\/))
+	   ((vms)				'(#\: #\]))
 	   (else
 	    (slib:warn "require.scm" 'unknown 'software-type (software-type))
 	    "/"))))
@@ -123,7 +123,7 @@
 ;@
 (define sub-vicinity
   (case (software-type)
-    ((VMS) (lambda
+    ((vms) (lambda
 	       (vic name)
 	     (let ((l (string-length vic)))
 	       (if (or (zero? (string-length vic))
@@ -133,10 +133,10 @@
 				  "." name "]")))))
     (else (let ((*vicinity-suffix*
 		 (case (software-type)
-		   ((NOSVE) ".")
-		   ((MACOS THINKC) ":")
-		   ((MS-DOS WINDOWS ATARIST OS/2) "\\")
-		   ((UNIX COHERENT PLAN9 AMIGA) "/"))))
+		   ((nosve) ".")
+		   ((macos thinkc) ":")
+		   ((ms-dos windows atarist os/2) "\\")
+		   ((unix coherent plan9 amiga) "/"))))
 	    (lambda (vic name)
 	      (string-append vic name *vicinity-suffix*))))))
 ;@
@@ -463,7 +463,7 @@
 ;;; Here for backward compatability
 (define scheme-file-suffix
   (let ((suffix (case (software-type)
-		  ((NOSVE) "_scm")
+		  ((nosve) "_scm")
 		  (else ".scm"))))
     (lambda () suffix)))