use ASDF:COERCE-PATHNAME for newer ASDF

dochang · Apr 19, 2011 · b91d5e5 · b91d5e5
1 parent ab416d1
commit b91d5e5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/package.lisp b/src/package.lisp
@@ -17,7 +17,6 @@
                 :delete-file-if-exists
                 :get-uid
                 :implementation-identifier
-                :merge-component-name-type
                 :resolve-location
                 :*verbose-out*)
   (:import-from :asia-fad-test

diff --git a/src/utils.lisp b/src/utils.lisp
@@ -48,7 +48,10 @@ The specifier will use the host and device components from DEFAULTS or
 
 See ASDF manual 5.3.4 for details."
   (if (typep name '(or pathname symbol string))
-      (merge-component-name-type name :type type :defaults defaults)
+      (funcall (if (fboundp 'coerce-pathname)
+                   'coerce-pathname
+                   'asdf::merge-component-name-type)
+               name :type type :defaults defaults)
       (pathspec (pathname name) :type type :defaults defaults)))
 
 (defun location-designator-p (location-designator)