r8164: fixed improved building

[uffi.git] / uffi-tests.asd

diff --git a/uffi-tests.asd b/uffi-tests.asd
index 18af90b1606e3b113ef9af4e258a78688f3499eb..d68d1b0ac83cd0b85b0de6d31ec352e5c41e51eb 100644 (file)
--- a/uffi-tests.asd
+++ b/uffi-tests.asd
@@ -14,22 +14,21 @@
   (:use #:asdf #:cl))
 (in-package #:uffi-tests-system)
 
-(defvar *asd-file-dir* (pathname-directory *load-truename*))
-(defvar *library-file-dir* (append *asd-file-dir* "tests"))
+(defvar *library-file-dir* (append (pathname-directory *load-truename*)
+                                  (list "tests")))
 
 (defclass uffi-test-source-file (c-source-file)
   ())
 
 (defmethod output-files ((o compile-op) (c uffi-test-source-file))
   (let ((found (some #'(lambda (dir)
-                           (probe-file (make-pathname :directory d
+                           (probe-file (make-pathname :directory dir
                                                       :name (component-name c)
                                                       :type "so")))
-                       '((:absolute "usr" "lib" "uffi")
-                         *asd-file-dir*))))
-    (if found
-       (list searched)
-       (list (make-pathname :name (component-name c)
+                       '((:absolute "usr" "lib" "uffi")))))
+    (list (if found
+             found
+             (make-pathname :name (component-name c)
                             :type "so"
                             :directory *library-file-dir*)))))