Permalink
Browse files

Adjust *MAXIMA-OBJDIR* and modify *.system files in share accordingly.

(1) When environment variable MAXIMA_OBJDIR is set, let *MAXIMA-OBJDIR* = $MAXIMA_OBJDIR/binary-foolisp.
  Shell script maxima-local sets MAXIMA_OBJDIR to $top_srcdir/binary.
(2) When MAXIMA_OBJDIR is not set, let *MAXIMA-OBJDIR* = *MAXIMA-USERDIR*/binary/binary-foolisp.
  • Loading branch information...
1 parent f3271cc commit 39375506dd889b9c0c1cc8380e4f4953b77e1067 robert_dodier committed Jan 25, 2009
View
@@ -4,6 +4,8 @@ MAXIMA_PREFIX=$top_srcdir
export MAXIMA_PREFIX
MAXIMA_LAYOUT_AUTOTOOLS=false
export MAXIMA_LAYOUT_AUTOTOOLS
+MAXIMA_OBJDIR="$top_srcdir/binary"
+export MAXIMA_OBJDIR
POSIX_SHELL=@POSIX_SHELL@
exec $POSIX_SHELL $top_srcdir/src/maxima "$@"
@@ -5,8 +5,7 @@
(mk:defsystem "affine"
:source-extension "lisp"
:source-pathname (maxima-load-pathname-directory)
- :binary-pathname (maxima-objdir "share" "affine"
- (concatenate 'string "binary-" *maxima-lispname*))
+ :binary-pathname (maxima-objdir "share" "affine")
:components ((:file "sys-declaim" :load-only t)
(:file "compat")
(:file "amacros")
@@ -2,8 +2,7 @@
(mk:defsystem graphs
:source-pathname (maxima::maxima-load-pathname-directory)
- :binary-pathname (maxima::maxima-objdir "share" "contrib" "graphs"
- (concatenate 'string "binary-" maxima::*maxima-lispname*))
+ :binary-pathname (maxima::maxima-objdir "share" "contrib" "graphs")
:source-extension "lisp"
:components
((:file "graph_core")
@@ -7,16 +7,14 @@
(mk:defsystem lapack-package
:source-pathname (maxima::maxima-load-pathname-directory)
- :binary-pathname (maxima::maxima-objdir "share" "lapack"
- (concatenate 'string "binary-" maxima::*maxima-lispname*))
+ :binary-pathname (maxima::maxima-objdir "share" "lapack")
:source-extension "lisp"
:components
((:file "lapack-package")))
(mk:defsystem blas
:source-pathname (maxima::maxima-load-pathname-directory)
- :binary-pathname (maxima::maxima-objdir "share" "lapack"
- (concatenate 'string "binary-" maxima::*maxima-lispname*))
+ :binary-pathname (maxima::maxima-objdir "share" "lapack")
:source-extension "lisp"
:depends-on ("lapack-package")
:components
@@ -7,8 +7,7 @@
(mk:defsystem minpack
:source-pathname (maxima::maxima-load-pathname-directory)
- :binary-pathname (maxima::maxima-objdir "share" "minpack"
- (concatenate 'string "binary-" maxima::*maxima-lispname*))
+ :binary-pathname (maxima::maxima-objdir "share" "minpack")
:depends-on ("minpack-package")
:components
((:module "lisp"
@@ -55,16 +54,14 @@
(mk:defsystem minpack-package
:source-pathname (maxima::maxima-load-pathname-directory)
- :binary-pathname (maxima::maxima-objdir "share" "minpack"
- (concatenate 'string "binary-" maxima::*maxima-lispname*))
+ :binary-pathname (maxima::maxima-objdir "share" "minpack")
:source-extension "lisp"
:components
((:file "minpack-package")))
(mk:defsystem minpack-interface
:source-pathname (maxima::maxima-load-pathname-directory)
- :binary-pathname (maxima::maxima-objdir "share" "minpack"
- (concatenate 'string "binary-" maxima::*maxima-lispname*))
+ :binary-pathname (maxima::maxima-objdir "share" "minpack")
:source-extension "lisp"
:depends-on ("minpack")
:components
View
@@ -2,8 +2,7 @@
(mk:defsystem "sym"
:source-extension "lisp"
- :binary-pathname (maxima::maxima-objdir "share" "sym"
- (concatenate 'string "binary-" maxima::*maxima-lispname*))
+ :binary-pathname (maxima::maxima-objdir "share" "sym")
:components
;; Reflects the order in sym1.mac.
((:module macros
View
@@ -403,12 +403,16 @@ When one changes, the other does too."
(if maxima-tempdir-env
(setq *maxima-tempdir* (maxima-parse-dirstring maxima-tempdir-env))
(setq *maxima-tempdir* (default-tempdir)))
- ;; Default objdir is userdir, because it's almost surely writable,
- ;; and because we don't want to clutter up random directories with
- ;; maxima stuff.
- (setq *maxima-objdir* (if maxima-objdir-env
- (maxima-parse-dirstring maxima-objdir-env)
- *maxima-userdir*))
+ ;; Default *MAXIMA-OBJDIR* is <userdir>/binary/binary-<foo>lisp,
+ ;; because userdir is almost surely writable, and we don't want to clutter up
+ ;; random directories with Maxima stuff.
+ ;; Append binary-<foo>lisp whether objdir is the default or obtained from environment.
+ (setq *maxima-objdir*
+ (concatenate 'string
+ (if maxima-objdir-env
+ (maxima-parse-dirstring maxima-objdir-env)
+ (concatenate 'string *maxima-userdir* "/binary"))
+ "/binary-" *maxima-lispname*))
; On Windows Vista gcc requires explicit include
#+gcl

0 comments on commit 3937550

Please sign in to comment.