[Maxima-commits] CVS: maxima/share/contrib/graphs graphs.system, 1.5, 1.6

[Andrej V. <an...@us...>]

Update of /cvsroot/maxima/maxima/share/contrib/graphs
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv26787

Modified Files:
	graphs.system 
Log Message:
Use the new maxima-load-pathname-directory and maxima-objdir functions.


Index: graphs.system
===================================================================
RCS file: /cvsroot/maxima/maxima/share/contrib/graphs/graphs.system,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- graphs.system	14 Aug 2008 17:50:11 -0000	1.5
+++ graphs.system	23 Jan 2009 22:00:16 -0000	1.6
@@ -1,40 +1,9 @@
 ;;; -*- Mode: lisp -*-
 
-#-gcl
-(progn
-  (defun graphs-source-pathname (subdir)
-    (merge-pathnames (make-pathname :directory (list :relative subdir))
-		     (make-pathname :directory (pathname-directory *load-truename*))))
-  (defun graphs-binary-pathname (subdir)
-    (merge-pathnames
-     (make-pathname
-      :name (concatenate 'string "binary-"
-			 #+clisp "clisp"
-			 #+cmu "cmucl"
-			 #+scl "scl"
-			 #+sbcl "sbcl"
-			 #+allegro "acl"
-			 #+openmcl "openmcl"
-			 #+abcl "abcl"
-			 #+ecl "ecl"
-			 #-(or clisp cmu scl sbcl gcl allegro openmcl abcl ecl) "unknownlisp")
-      :directory (list :relative subdir))
-     (make-pathname :directory (pathname-directory *load-truename*))))
-  )
-
-#+gcl
-(progn
-  (defun graphs-source-pathname (subdir)
-    (merge-pathnames (make-pathname :directory (list subdir))
-		     (make-pathname :directory (pathname-directory sys:*load-pathname*))))
-  (defun graphs-binary-pathname (subdir)
-    (merge-pathnames (make-pathname :directory (list subdir))
-		     (make-pathname :directory (pathname-directory sys:*load-pathname*))))
-  )
-
 (mk:defsystem graphs
-  :source-pathname (graphs-source-pathname ".")
-  :binary-pathname (graphs-binary-pathname ".")
+  :source-pathname (maxima::maxima-load-pathname-directory)
+  :binary-pathname (maxima::maxima-objdir "share" "contrib" "graphs"
+					  (concatenate 'string "binary-" maxima::*maxima-lispname*))
   :source-extension "lisp"
   :components
   ((:file "graph_core")