Commit b85a0252 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

1.677: more places need use merge-pathnames*.

GNUmakefile to clean *.bak.
parent fe8c75ed
......@@ -38,7 +38,7 @@ website-copy: FORCE
bin/rsync-cp.sh tmp/asdf.lisp $(webhome_private)
clean_dirs = $(sourceDirectory)
clean_extensions = fasl dfsl cfsl fasl fas lib dx32fsl lx64fsl lx32fsl o
clean_extensions = fasl dfsl cfsl fasl fas lib dx32fsl lx64fsl lx32fsl o bak
clean: FORCE
@for dir in $(clean_dirs); do \
......
......@@ -60,7 +60,7 @@
(eval-when (:load-toplevel :compile-toplevel :execute)
(let* ((asdf-version
;; the 1+ hair is to ensure that we don't do an inadvertent find and replace
(subseq "VERSION:1.676" (1+ (length "VERSION"))))
(subseq "VERSION:1.677" (1+ (length "VERSION"))))
#+allegro (excl::*autoload-package-name-alist* nil)
(existing-asdf (find-package :asdf))
(versym '#:*asdf-version*)
......@@ -677,7 +677,7 @@ actually-existing directory."
"Resolve as much of a pathname as possible"
(block nil
(when (typep p 'logical-pathname) (return p))
(let* ((p (merge-pathnames p))
(let* ((p (merge-pathnames* p))
(directory (pathname-directory p)))
(when (typep p 'logical-pathname) (return p))
(ignore-errors (return (truename p)))
......@@ -1794,7 +1794,7 @@ details."
(if *resolve-symlinks*
(resolve-symlinks (or *load-truename* *compile-file-truename*))
*load-pathname*)))))
(or (and pathname-supplied-p (merge-pathnames pathname file-pathname))
(or (and pathname-supplied-p (merge-pathnames* pathname file-pathname))
file-pathname
(current-directory))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment