diff options
Diffstat (limited to 'src/interp/daase.lisp.pamphlet')
| -rw-r--r-- | src/interp/daase.lisp.pamphlet | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/interp/daase.lisp.pamphlet b/src/interp/daase.lisp.pamphlet index ed192038..8b40ffed 100644 --- a/src/interp/daase.lisp.pamphlet +++ b/src/interp/daase.lisp.pamphlet @@ -319,7 +319,7 @@ database. (defun asharp (file &optional (flags *asharpflags*)) "call the asharp compiler" (system::system - (concatenate 'string (|getEnv| "AXIOM") "/compiler/bin/axiomxl " + (concatenate 'string (|systemRootDirectory|) "/compiler/bin/axiomxl " flags " " file))) (defun resethashtables () @@ -423,7 +423,7 @@ database. |Integer| |List| |OutputForm|)) (dolist (con constr) (let ((c (concatenate 'string - (|getEnv| "AXIOM") "/algebra/" + (|systemRootDirectory|) "/algebra/" (string (getdatabase con 'abbreviation)) ".o"))) (format t " preloading ~a.." c) (if (probe-file c) @@ -1247,12 +1247,14 @@ database. (defun DaaseName (name erase?) (let (daase filename) - (declare (special $spadroot)) - (if (setq daase (|getEnv| "DAASE")) + (if (setq daase (|systemAlgebraDirectory|)) (progn - (setq filename (concatenate 'string daase "/algebra/" name)) + (setq filename (concatenate 'string daase name)) (format t " Using local database ~a.." filename)) - (setq filename (concatenate 'string $spadroot "/algebra/" name))) + (setq filename (concatenate 'string + (|systemRootDirectory|) + "/algebra/" + name))) (when erase? (system::system (concatenate 'string "rm -f " filename))) filename)) @@ -1792,7 +1794,7 @@ database format. (set (foam::axiomxl-file-init-name "filecliq") NOPfuncall) (set (foam::axiomxl-file-init-name "attrib") NOPfuncall) ;; following needs to happen inside restart since $AXIOM may change - (let ((asharprootlib (strconc (|getEnv| "AXIOM") "/aldor/lib/"))) + (let ((asharprootlib (strconc (|systemRootDirectory|) "/aldor/lib/"))) (set-file-getter (strconc asharprootlib "runtime")) (set-file-getter (strconc asharprootlib "lang")) (set-file-getter (strconc asharprootlib "attrib")) |