[armedbear-cvs] r12666 - trunk/abcl/src/org/armedbear/lisp

[Mark Evenson]

Author: mevenson
Date: Tue May 11 10:13:17 2010
New Revision: 12666

Log:
Fix ASDF:MERGE-PATHNAMES* in the case that default directory is nil.



Modified:
   trunk/abcl/src/org/armedbear/lisp/asdf.lisp

Modified: trunk/abcl/src/org/armedbear/lisp/asdf.lisp
==============================================================================
--- trunk/abcl/src/org/armedbear/lisp/asdf.lisp	(original)
+++ trunk/abcl/src/org/armedbear/lisp/asdf.lisp	Tue May 11 10:13:17 2010
@@ -516,7 +516,9 @@
             ((:relative)
              (values (pathname-host defaults)
                      (pathname-device defaults)
-                     (append (pathname-directory defaults) (cdr directory))
+                     (if (null (pathname-directory defaults))
+                         directory
+                         (append (pathname-directory defaults) (cdr directory)))
                      (unspecific-handler defaults)))
             #+gcl
             (t