r2246: *** empty log message ***

[uffi.git] / uffi.system

diff --git a/uffi.system b/uffi.system
index 5ccaba482bfdad0eea7e62040279ac3be9f82d76..545fd4760a0ee2e96eacda9fbae4d3dfde25db92 100644 (file)
--- a/uffi.system
+++ b/uffi.system
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Feb 2002
 ;;;;
-;;;; $Id: uffi.system,v 1.14 2002/04/09 20:06:18 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,31 +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*)
-(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*))
+;; 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
 
-(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"))