From 1b192667b7dc3f8a0ad9fcc78c0a2f527c95b9fc Mon Sep 17 00:00:00 2001 From: dos-reis Date: Thu, 11 Oct 2007 07:50:20 +0000 Subject: * bookvol5.pamphlet (|loadExposureGroupData|): Define unconditionally. Don't use "AXIOM" variable. * as.boot.pamphlet (as): Remove dead code. --- src/interp/ChangeLog | 6 ++++++ src/interp/as.boot.pamphlet | 2 -- src/interp/bookvol5.pamphlet | 11 +---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog index 9d5369ef..b75ca327 100644 --- a/src/interp/ChangeLog +++ b/src/interp/ChangeLog @@ -1,3 +1,9 @@ +2007-10-11 Gabriel Dos Reis + + * bookvol5.pamphlet (|loadExposureGroupData|): Define + unconditionally. Don't use "AXIOM" variable. + * as.boot.pamphlet (as): Remove dead code. + 2007-10-11 Gabriel Dos Reis * Makefile.pamphlet (<>): Remove. diff --git a/src/interp/as.boot.pamphlet b/src/interp/as.boot.pamphlet index fd848ab2..38c36548 100644 --- a/src/interp/as.boot.pamphlet +++ b/src/interp/as.boot.pamphlet @@ -86,8 +86,6 @@ asAll lines == as name == astran STRCONC(STRINGIMAGE name,'".asy") --- astran STRCONC(getEnv('"AXIOM"), --- '"/../../obj/rios/as/",STRINGIMAGE name,'".asy") 'done astran asyFile == diff --git a/src/interp/bookvol5.pamphlet b/src/interp/bookvol5.pamphlet index 65bc8671..93f4093a 100644 --- a/src/interp/bookvol5.pamphlet +++ b/src/interp/bookvol5.pamphlet @@ -745,24 +745,15 @@ This function performs those setup commands. \subsection{defun loadExposureGroupData} <>= -#+:AKCL (defun |loadExposureGroupData| () (cond ((load "./exposed" :verbose nil :if-does-not-exist nil) '|done|) - ((load (concat (system:getenv "AXIOM") "/algebra/exposed") + ((load (concat (|systemRootDirectory|) "/algebra/exposed") :verbose nil :if-does-not-exist nil) '|done|) (t '|failed|) )) -#+:CCL -(defun |loadExposureGroupData| () - (cond - ((load "./exposed.lsp" :verbose NIL :if-does-not-exist NIL) '|done|) - ((load (concat (|systemRootDirectory|) "/../../src/algebra/exposed.lsp") - :verbose nil :if-does-not-exist nil) '|done|) - (t nil) )) - @ \subsection{make-absolute-filename} Prefix a filename with the {\bf AXIOM} shell variable. -- cgit v1.2.3