aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-11-16 11:35:59 +0000
committerdos-reis <gdr@axiomatics.org>2007-11-16 11:35:59 +0000
commit9d24bc01e0c59b7d23546eaae53634462b9ff90c (patch)
tree21dabd9762faa6e7a57b981d32fe48e970b7d22e
parente2aabd8c9625a3009115624618a290627c2c61fa (diff)
downloadopen-axiom-9d24bc01e0c59b7d23546eaae53634462b9ff90c.tar.gz
* daase.lisp (getdatabase): Fix path to source file and object file.
-rw-r--r--src/interp/ChangeLog4
-rw-r--r--src/interp/daase.lisp6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index ebaf84a0..cda2ccd5 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-16 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * daase.lisp (getdatabase): Fix path to source file and object file.
+
2007-11-15 Gabriel Dos Reis <gdr@cs.tamu.edu>
* Makefile.pamphlet (OBJS): Include spad-parser.$(FASLEXT).
diff --git a/src/interp/daase.lisp b/src/interp/daase.lisp
index 2ef3529b..c3d47c27 100644
--- a/src/interp/daase.lisp
+++ b/src/interp/daase.lisp
@@ -772,7 +772,7 @@
(when (and data (string= (directory-namestring data) "")
(string= (pathname-type data) "spad"))
(setq data
- (concatenate 'string (|systemRootDirectory|) "/../../src/algebra/" data))))
+ (concatenate 'string (|systemRootDirectory|) "src/algebra/" data))))
(asharp? ; is this asharp code?
(if (consp data)
(setq data (cdr data))
@@ -781,10 +781,10 @@
(if (consp data)
(setq data
(if (string= (directory-namestring (car data)) "")
- (concatenate 'string (|systemRootDirectory|) "/algebra/" (car data) ".o")
+ (concatenate 'string (|systemRootDirectory|) "algebra/" (car data) ".o")
(car data)))
(when (and data (string= (directory-namestring data) ""))
- (setq data (concatenate 'string (|systemRootDirectory|) "/algebra/" data ".o")))))))
+ (setq data (concatenate 'string (|systemRootDirectory|) "algebra/" data ".o")))))))
data))
; )library top level command -- soon to be obsolete