diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-08-21 21:54:30 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-08-21 21:54:30 +0000 |
| commit | 418997ed442bfa87c81849a3d8e9651407b6d2ec (patch) | |
| tree | 25312da5501065e305070ef8ba0d8a12ea998264 | |
| parent | 27ab3bdab9b9499046f0a1e380024a88d6d6275b (diff) | |
| download | open-axiom-418997ed442bfa87c81849a3d8e9651407b6d2ec.tar.gz | |
* lisp/core.lisp.in (|systemRootDirectory|): Lookup option by name.
(|systemLibraryDirectory|): Likewise.
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lisp/core.lisp.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d4ce270..1739d799 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,10 @@ 2008-08-21 Gabriel Dos Reis <gdr@cs.tamu.edu> + * lisp/core.lisp.in (|systemRootDirectory|): Lookup option by name. + (|systemLibraryDirectory|): Likewise. + +2008-08-21 Gabriel Dos Reis <gdr@cs.tamu.edu> + * interp/g-error.boot (systemErrorHandler): New. * interp/sys-driver.boot (restart): Use it. diff --git a/src/lisp/core.lisp.in b/src/lisp/core.lisp.in index d1e24b9a..7685ff19 100644 --- a/src/lisp/core.lisp.in +++ b/src/lisp/core.lisp.in @@ -218,7 +218,7 @@ ;; A directory specified on command line takes precedence ;; over directory specified at configuration time. (defun |systemRootDirectory| nil - (let ((dir (assoc (|Option| '|system|) (|%systemOptions|)))) + (let ((dir (assoc (|Option| "system") (|%systemOptions|)))) (if (not (null dir)) (|ensureTrailingSlash| (cdr dir)) |$systemInstallationDirectory|))) @@ -227,7 +227,7 @@ ;; libraries, either as specified on command line, or as inferred ;; from the system root directory. (defun |systemLibraryDirectory| nil - (let ((dir (assoc (|Option| '|syslib|) (|%systemOptions|)))) + (let ((dir (assoc (|Option| "syslib") (|%systemOptions|)))) (if (not (null dir)) (|ensureTrailingSlash| (cdr dir)) (concatenate 'string (|systemRootDirectory|) "lib/")))) |