X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi.system;h=5ccaba482bfdad0eea7e62040279ac3be9f82d76;hb=0715838b028bbbd29189309987087473689f42e5;hp=d1401ff47f78236a162444eee9400f292c7d69ad;hpb=54de0ff398a996c976d053d5b56b46f0a44d3e23;p=uffi.git

diff --git a/uffi.system b/uffi.system
index d1401ff..5ccaba4 100644
--- a/uffi.system
+++ b/uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: uffi.system,v 1.7 2002/03/20 04:57:08 kevin Exp $
+;;;; $Id: uffi.system,v 1.14 2002/04/09 20:06:18 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -23,25 +23,25 @@
 		     :defaults *load-truename*))
 
 (set-logical-host-for-pathname "UFFI" *load-truename*)
-
-(defconstant +uffi-src-dir+ 
-  (format nil "UFFI:src;~A;"
-	  #+allegro "allegro"
-	  #+lispworks "lispworks"
-	  #+cmu "cmucl"
-	  #+mcl "mcl"
-	  #+corman "corman")
-  "Logical pathname for source")
-
-(defconstant +uffi-bin-dir+ (concatenate 'string +uffi-src-dir+ "bin;")
-  "Logical pathname for binaries")
+(set-logical-host-for-pathname "UFFI-SRC" 
+			       (merge-pathnames
+				(make-pathname
+				 :directory
+				 #+(or cmu allegro lispworks)
+				 '(:relative "src")
+				 #+mcl
+				 '(:relative "src" "mcl")
+				 #+cormanlisp
+				 '(:relative "src" "corman")
+				 )
+				*load-truename*))
 
 ;;; UFFI system definition
 
 (mk:defsystem :uffi
-    :source-pathname "UFFI:src;"
+    :source-pathname "UFFI-SRC:"
     :source-extension "cl"
-    :binary-pathname "UFFI:src;bin;"
+    :binary-pathname "UFFI-SRC:bin;"
     :components 
     ((:file "package")
      (:file "primitives" :depends-on ("package"))
@@ -49,25 +49,7 @@
      (:file "objects" :depends-on ("primitives"))
      (:file "aggregates" :depends-on ("primitives"))
      (:file "functions" :depends-on ("primitives"))
-     (:file "libraries" :depends-on ("package"))))
-
-#+not-yet
-(mk:defsystem :uffi
-    :source-pathname #.+uffi-src-dir+
-    :source-extension "cl"
-    :binary-pathname #.+uffi-bin-dir+
-    :components 
-    ((:file "package")
-     (:file "primitives" :depends-on ("package"))
-     (:file "strings" :depends-on ("primitives"))
-     (:file "objects" :depends-on ("primitives"))
-     (:file "aggregates" :depends-on ("primitives"))
-     (:file "functions" :depends-on ("primitives"))
-     (:file "libraries" :depends-on ("package"))))
-
- 
-
-
-
-
+     (:file "libraries" :depends-on ("package")))
+    :finally-do
+    (pushnew :uffi cl:*features*))