From e662e66b323f896bc662d1ff326cb14cc5a4950a Mon Sep 17 00:00:00 2001 From: dos-reis Date: Wed, 10 Oct 2007 19:23:38 +0000 Subject: src/input/ 2007-10-10 Gabriel Dos Reis * Makefile.pamphlet (TESTSYS): Tidy. src/interp/ 2007-10-10 Gabriel Dos Reis * br-search.boot.pamphlet: Replace uses of $SPAROOT with systemRootDirectory. * construc.lisp.pamphlet: Likewise. * daase.lisp.pamphlet: Likewise. * i-toplev.boot.pamphlet: Likewise. * patches.lisp.pamphlet: Likewise. * pathname.boot.pamphlet: Likewise. * util.lisp.pamphlet: Likewise. * bookvol5.pamphlet: Remove $spadroot throughout. (initroot): Remove. (reroot): Lose argument. * Makefile.pamphlet (makeint.lisp): Depend on sys-driver.$(FASLEXT). Explicitly load it. Miscellaneous cleanup. --- src/interp/construc.lisp.pamphlet | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/interp/construc.lisp.pamphlet') diff --git a/src/interp/construc.lisp.pamphlet b/src/interp/construc.lisp.pamphlet index 947429e7..e97d2501 100644 --- a/src/interp/construc.lisp.pamphlet +++ b/src/interp/construc.lisp.pamphlet @@ -142,9 +142,9 @@ (lspname (name) (concatenate 'string (string name) ".NRLIB/code.lsp")) (fullname (name) (concatenate 'string - $spadroot "/../../int/algebra/" (string name) ".NRLIB/index.KAF")) + (|systemRootDirectory|) "/../../int/algebra/" (string name) ".NRLIB/index.KAF")) (fullcode (name) - (concatenate 'string $spadroot "/../../int/algebra/" (string name) ".NRLIB/code.lsp"))) + (concatenate 'string (|systemRootDirectory|) "/../../int/algebra/" (string name) ".NRLIB/code.lsp"))) (let (masterindex blanks index newindex (space (* 22 (length innames)))) (setq newindex space) (system::system (concatenate 'string "rm -r " (libname outname))) @@ -759,13 +759,12 @@ ; it sets up 2 hash tables, opens the database and hashes the index values (defun constructOpen () - (declare (special $spadroot)) "open the constructor database and hash the keys" (let (constructors pos) (setq *opalist-hash* (make-hash-table)) (setq *modemap-hash* (make-hash-table)) (setq *construct-stream* - (open (concatenate 'string $spadroot "/algebra/construct.daase"))) + (open (concatenate 'string (|systemRootDirectory|) "/algebra/construct.daase"))) (setq pos (read *construct-stream*)) (file-position *construct-stream* pos) (setq constructors (read *construct-stream*)) @@ -809,11 +808,10 @@ ; the list (it should be a list of *SYMBOLS*, not strings, like ; '(pi nni ....) and constructs the contstruct.daase database (defun constructdb (libs) - (declare (special $spadroot)) (let (alist opalist modemap opalistpos modemappos index master masterpos pos) (labels ( (name (x) - (concatenate 'string $spadroot "/algebra/" (string x) ".NRLIB/index.KAF"))) + (concatenate 'string (|systemRootDirectory|) "/algebra/" (string x) ".NRLIB/index.KAF"))) (with-open-file (out "construct.daase" :direction :output) (print " " out) (finish-output out) -- cgit v1.2.3