projects
/
clsql.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r10922: 03 May 2006 Kevin Rosenberg <kevin@rosenberg.net>
[clsql.git]
/
clsql-uffi.asd
diff --git
a/clsql-uffi.asd
b/clsql-uffi.asd
index 48372a1cff433b5060ae08a564e0f355c5108045..19b9fb4ce44afbd342b35a4026c86998b9a6902f 100644
(file)
--- a/
clsql-uffi.asd
+++ b/
clsql-uffi.asd
@@
-21,8
+21,9
@@
(defpackage clsql-uffi-system (:use #:asdf #:cl))
(in-package clsql-uffi-system)
(defpackage clsql-uffi-system (:use #:asdf #:cl))
(in-package clsql-uffi-system)
-(defvar *library-file-dir* (append (pathname-directory *load-truename*)
- (list "uffi")))
+(defvar *clsql-uffi-library-dir*
+ (merge-pathnames "uffi/"
+ (make-pathname :name nil :type nil :defaults *load-truename*)))
(defclass clsql-uffi-source-file (c-source-file)
())
(defclass clsql-uffi-source-file (c-source-file)
())
@@
-43,7
+44,7
@@
found
(make-pathname :name (component-name c)
:type library-file-type
found
(make-pathname :name (component-name c)
:type library-file-type
- :d
irectory *library-file
-dir*)))))
+ :d
efaults *clsql-uffi-library
-dir*)))))
(defmethod perform ((o load-op) (c clsql-uffi-source-file))
nil) ;;; library will be loaded by a loader file
(defmethod perform ((o load-op) (c clsql-uffi-source-file))
nil) ;;; library will be loaded by a loader file
@@
-59,9
+60,7
@@
(unless (zerop (run-shell-command
#-freebsd "cd ~A; make"
#+freebsd "cd ~A; gmake"
(unless (zerop (run-shell-command
#-freebsd "cd ~A; make"
#+freebsd "cd ~A; gmake"
- (namestring (make-pathname :name nil
- :type nil
- :directory *library-file-dir*))))
+ (namestring *clsql-uffi-library-dir*)))
(error 'operation-error :component c :operation o))))
(defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))
(error 'operation-error :component c :operation o))))
(defmethod operation-done-p ((o compile-op) (c clsql-uffi-source-file))