X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=uffi.system;h=545fd4760a0ee2e96eacda9fbae4d3dfde25db92;hb=c6173422ade336ec21cd0a9ae866bafd7d402469;hp=f0c4beb9643a324f802af051972806cfcdd19186;hpb=7fcec7e8319f5b11c8f501b6a869142cd26a8bdd;p=uffi.git

diff --git a/uffi.system b/uffi.system
index f0c4beb..545fd47 100644
--- a/uffi.system
+++ b/uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: uffi.system,v 1.8 2002/03/21 10:52:17 kevin Exp $
+;;;; $Id: uffi.system,v 1.15 2002/07/26 03:18:27 kevin Exp $
 ;;;;
 ;;;; This file, part of UFFI, is Copyright (c) 2002 by Kevin M. Rosenberg
 ;;;;
@@ -17,32 +17,20 @@
 ;;;; *************************************************************************
 
 (declaim (optimize (debug 3) (speed 3) (safety 1) (compilation-speed 0)))
-(in-package :cl-user)
+(in-package :make)
 
-(load (make-pathname :name "set-logical" :type "cl"
-		     :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")
+;; For use with non-Debian installations
+(let ((helper-pathname (make-pathname :name "set-cl-library" :type "cl"
+				      :defaults *load-truename*)))
+  (when (probe-file helper-pathname)
+      (load helper-pathname)))
 
 ;;; UFFI system definition
 
-#+(or cmu allegro lispworks)
-(mk:defsystem :uffi
-    :source-pathname "UFFI:src;"
+(make:defsystem :uffi
+    :source-pathname #-mcl "cl-library:uffi;"
+                     #+mcl "cl-library:uffi;mcl;"
     :source-extension "cl"
-    :binary-pathname "UFFI:src;bin;"
     :components 
     ((:file "package")
      (:file "primitives" :depends-on ("package"))
@@ -50,25 +38,7 @@
      (:file "objects" :depends-on ("primitives"))
      (:file "aggregates" :depends-on ("primitives"))
      (:file "functions" :depends-on ("primitives"))
-     (:file "libraries" :depends-on ("package"))))
-
-#-(or cmu allegro lispworks)
-(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*))