Index: /trunk/ccl/level-1/l1-pathnames.lisp
===================================================================
--- /trunk/ccl/level-1/l1-pathnames.lisp	(revision 5629)
+++ /trunk/ccl/level-1/l1-pathnames.lisp	(revision 5630)
@@ -117,4 +117,6 @@
         ((null wild)
          t)
+        ((not (and (stringp name) (stringp wild)))
+         (eq name wild))
         (t (%path-str*= name wild))))
 
@@ -619,5 +621,5 @@
       (native-to-directory-pathname dirpath)
       (let* ((directory-containing-heap-image
-              (make-pathname :directory (pathname-directory *heap-image-name*)))
+              (make-pathname :directory (pathname-directory (%realpath *heap-image-name*))))
              (rpath (merge-pathnames
 		     #+darwinppc-target "../Resources/ccl/"