From 128faf3663eab22c02c21ccbb42fb7d388cb6847 Mon Sep 17 00:00:00 2001 From: <623633@gmx.com> Date: Tue, 13 Sep 2011 02:07:21 +0300 Subject: [PATCH] * Fix search paths fixed hardwired package search path to /usr/share/slib where the actual files live in this package. patch against upstream 3b3 (update needed anyway, for differnt bug with mit-scheme) --- STk.init | 2 +- Template.scm | 2 +- bigloo.init | 4 ++-- chez.init | 2 +- clrnamdb.scm | 2 +- dbutil.scm | 2 +- elk.init | 2 +- gambit.init | 2 +- glob.scm | 4 ++-- jscheme.init | 4 ++-- kawa.init | 2 +- manifest.scm | 20 ++++++++++---------- mitscheme.init | 2 +- mzscheme.init | 2 +- s7.init | 2 +- scheme2c.init | 2 +- t3.init | 2 +- vscm.init | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/STk.init b/STk.init index c73f33a..2004609 100644 --- a/STk.init +++ b/STk.init @@ -35,7 +35,7 @@ ;;; (library-vicinity) should be defined to be the pathname of the ;;; directory where files of Scheme library functions reside. (define library-vicinity - (let ((library-path (or (getenv "SCHEME_LIBRARY_PATH") "/usr/local/lib/slib/"))) + (let ((library-path (or (getenv "SCHEME_LIBRARY_PATH") "/usr/share/slib/"))) (lambda () library-path))) diff --git a/Template.scm b/Template.scm index c61de29..aa195a8 100644 --- a/Template.scm +++ b/Template.scm @@ -43,7 +43,7 @@ ;; Use this path if your scheme does not support GETENV ;; or if SCHEME_LIBRARY_PATH is not set. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\SLIB\\") (else ""))))) diff --git a/bigloo.init b/bigloo.init index 54467bb..00f3ee4 100644 --- a/bigloo.init +++ b/bigloo.init @@ -45,8 +45,8 @@ (case (software-type) ((unix) (cond ((directory? "/usr/share/slib/") "/usr/share/slib/") - ((directory? "/usr/local/lib/slib/") - "/usr/local/lib/slib/") + ((directory? "/usr/share/slib/") + "/usr/share/slib/") (else ""))) ((ms-dos) "C:\\SLIB\\") (else ""))))) diff --git a/chez.init b/chez.init index dd923f9..024f027 100644 --- a/chez.init +++ b/chez.init @@ -43,7 +43,7 @@ ;; Use this path if your scheme does not support GETENV ;; or if SCHEME_LIBRARY_PATH is not set. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\SLIB\\") (else ""))))) diff --git a/clrnamdb.scm b/clrnamdb.scm index f9ea288..ce6e1c6 100644 --- a/clrnamdb.scm +++ b/clrnamdb.scm @@ -1,4 +1,4 @@ -;;; "/usr/local/lib/slib/clrnamdb.scm" SLIB 3b3 alist-table database -*-scheme-*- +;;; "/usr/share/slib/clrnamdb.scm" SLIB 3b3 alist-table database -*-scheme-*- ( (10 diff --git a/dbutil.scm b/dbutil.scm index f29f119..a4b340c 100644 --- a/dbutil.scm +++ b/dbutil.scm @@ -349,7 +349,7 @@ ;;@example ;;(mdbm:report) ;;@print{} -;; alist-table 003 /usr/local/lib/slib/clrnamdb.scm +;; alist-table 003 /usr/share/slib/clrnamdb.scm ;; alist-table 001 ! sdram.db jaffer@@aubrey.jaffer.3166:1038628199 ;;@end example diff --git a/elk.init b/elk.init index 3021352..685b7d6 100644 --- a/elk.init +++ b/elk.init @@ -56,7 +56,7 @@ (or (getenv "SCHEME_LIBRARY_PATH") ;; Uses this path if SCHEME_LIBRARY_PATH is not defined. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\SLIB\\") (else ""))))) diff --git a/gambit.init b/gambit.init index d96ab96..5992ab0 100644 --- a/gambit.init +++ b/gambit.init @@ -65,7 +65,7 @@ ;; Use this path if your scheme does not support GETENV ;; or if SCHEME_LIBRARY_PATH is not set. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((macos) (string-append (implementation-vicinity) "slib:")) ((amiga) "dh0:scm/Library/") ((vms) "lib$scheme:") diff --git a/glob.scm b/glob.scm index 5a135ca..fc15db4 100644 --- a/glob.scm +++ b/glob.scm @@ -284,8 +284,8 @@ (g str)))) ;;@example -;;(replace-suffix "/usr/local/lib/slib/batch.scm" ".scm" ".c") -;;@result{} "/usr/local/lib/slib/batch.c" +;;(replace-suffix "/usr/share/slib/batch.scm" ".scm" ".c") +;;@result{} "/usr/share/slib/batch.c" ;;@end example ;;@args proc k diff --git a/jscheme.init b/jscheme.init index 9a0f0e6..d0d47e0 100644 --- a/jscheme.init +++ b/jscheme.init @@ -11,7 +11,7 @@ ;;; java -classpath "lib/jscheme.jar:lib/slib.zip" jscheme.REPL slib/jscheme.init "$@" ;;; AGJ: This line works on my RedHat-9.0 system: -;;; java -cp src:/usr/local/share/java/jscheme.jar:/usr/local/lib/slib jscheme.REPL jscheme.init +;;; java -cp src:/usr/local/share/java/jscheme.jar:/usr/share/slib jscheme.REPL jscheme.init ;;; Alternatively, set the location of the slib directory using the ;;; -D SCHEME_LIBRARY_PATH=... system property. @@ -72,7 +72,7 @@ ;; Use this path if your scheme does not support GETENV ;; or if SCHEME_LIBRARY_PATH is not set. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\SLIB\\") (else ""))))) diff --git a/kawa.init b/kawa.init index dde1051..f400605 100644 --- a/kawa.init +++ b/kawa.init @@ -43,7 +43,7 @@ ;; Use this path if your scheme does not support GETENV ;; or if SCHEME_LIBRARY_PATH is not set. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\SLIB\\") (else ""))))) diff --git a/manifest.scm b/manifest.scm index aa15e6e..6842686 100644 --- a/manifest.scm +++ b/manifest.scm @@ -182,9 +182,9 @@ (f2l file)) ;;@example ;;(file->loads (in-vicinity (library-vicinity) "scainit.scm")) -;; @result{} ("/usr/local/lib/slib/scaexpp.scm" -;; "/usr/local/lib/slib/scaglob.scm" -;; "/usr/local/lib/slib/scaoutp.scm") +;; @result{} ("/usr/share/slib/scaexpp.scm" +;; "/usr/share/slib/scaglob.scm" +;; "/usr/share/slib/scaoutp.scm") ;;@end example ;;@body @@ -214,7 +214,7 @@ ans))) ;;@example ;;(load->path '(in-vicinity (library-vicinity) "mklibcat")) -;; @result{} "/usr/local/lib/slib/mklibcat.scm" +;; @result{} "/usr/share/slib/mklibcat.scm" ;;@end example ;;@body @@ -363,21 +363,21 @@ ;; ;;@example ;;(feature->export-alist 'r5rs slib:catalog)) -;; @result{} (("/usr/local/lib/slib/values.scm" +;; @result{} (("/usr/share/slib/values.scm" ;; call-with-values values) -;; ("/usr/local/lib/slib/mbe.scm" +;; ("/usr/share/slib/mbe.scm" ;; define-syntax macro:expand ;; macro:load macro:eval) -;; ("/usr/local/lib/slib/eval.scm" +;; ("/usr/share/slib/eval.scm" ;; eval scheme-report-environment ;; null-environment interaction-environment)) ;; ;;(feature->export-alist 'stdio *catalog*) -;; @result{} (("/usr/local/lib/slib/scanf.scm" +;; @result{} (("/usr/share/slib/scanf.scm" ;; fscanf sscanf scanf scanf-read-list) -;; ("/usr/local/lib/slib/printf.scm" +;; ("/usr/share/slib/printf.scm" ;; sprintf printf fprintf) -;; ("/usr/local/lib/slib/stdio.scm" +;; ("/usr/share/slib/stdio.scm" ;; stderr stdout stdin)) ;; ;;(feature->exports 'stdio slib:catalog) diff --git a/mitscheme.init b/mitscheme.init index 845eb87..be277b5 100644 --- a/mitscheme.init +++ b/mitscheme.init @@ -60,7 +60,7 @@ ;; Use this path if your scheme does not support GETENV. (case (software-type) ((ms-dos) "c:\\slib\\") - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") (else ""))))) (lambda () library-path))) diff --git a/mzscheme.init b/mzscheme.init index db6b3b9..7203dd3 100644 --- a/mzscheme.init +++ b/mzscheme.init @@ -54,7 +54,7 @@ ;; look for slib in a few common places (ormap (lambda (dir) (and (directory-exists? dir) dir)) - '("/usr/local/lib/slib/" + '("/usr/share/slib/" "/usr/share/slib/" ;; this is for RH/Fedora that uses umb-scheme for slib ;;"/usr/share/umb-scheme/slib" diff --git a/s7.init b/s7.init index 8e240a0..447cdc6 100644 --- a/s7.init +++ b/s7.init @@ -47,7 +47,7 @@ ;; Use this path if your scheme does not support GETENV ;; or if SCHEME_LIBRARY_PATH is not set. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\Program Files\\slib\\") (else ""))))) diff --git a/scheme2c.init b/scheme2c.init index 4f98f81..c56cfd6 100644 --- a/scheme2c.init +++ b/scheme2c.init @@ -43,7 +43,7 @@ (define library-vicinity (let ((library-path (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\SLIB\\") (else "")))) diff --git a/t3.init b/t3.init index 80e66a7..c41613f 100644 --- a/t3.init +++ b/t3.init @@ -40,7 +40,7 @@ (make-simple-switch 'library-vicinity (lambda (x) (or (string? x) (false? x))) '#f)) -(set (library-vicinity) "/usr/local/lib/slib/") +(set (library-vicinity) "/usr/share/slib/") ;;Obviously put your value here. ;;; (home-vicinity) should return the vicinity of the user's HOME diff --git a/vscm.init b/vscm.init index d6e48d3..2f06993 100644 --- a/vscm.init +++ b/vscm.init @@ -72,7 +72,7 @@ (or (getenv "SCHEME_LIBRARY_PATH") ;; Uses this path if SCHEME_LIBRARY_PATH is not set. (case (software-type) - ((unix) "/usr/local/lib/slib/") + ((unix) "/usr/share/slib/") ((vms) "lib$scheme:") ((ms-dos) "C:\\SLIB\\") (else ""))))) -- 1.7.5.4