From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Thu, 20 Apr 2006 08:48:24 +0000 (+0000)
Subject: 0.9.11.42:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=11e1cd9c04181469f61558abd6133f085c0914fb;p=sbcl.git

0.9.11.42:
	Merge fix from upstream ASDF, keeping (for now) the local win32
	modification which should have been sent upstream
---

diff --git a/contrib/asdf/asdf.lisp b/contrib/asdf/asdf.lisp
index 098cdfd..ad2e99c 100644
--- a/contrib/asdf/asdf.lisp
+++ b/contrib/asdf/asdf.lisp
@@ -1,4 +1,4 @@
-;;; This is asdf: Another System Definition Facility.  1.93
+;;; This is asdf: Another System Definition Facility.  1.94
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome: please mail to
 ;;; <cclan-list@lists.sf.net>.  But note first that the canonical
@@ -109,7 +109,7 @@
 
 (in-package #:asdf)
 
-(defvar *asdf-revision* (let* ((v "1.93")
+(defvar *asdf-revision* (let* ((v "1.94")
                                (colon (or (position #\: v) -1))
                                (dot (position #\. v)))
                           (and v colon dot
@@ -442,7 +442,10 @@ system."))
 (defmethod component-relative-pathname ((component source-file))
   (let ((relative-pathname (slot-value component 'relative-pathname)))
     (if relative-pathname
-        relative-pathname
+        (merge-pathnames
+         relative-pathname
+         (make-pathname
+          :type (source-file-type component (component-system component))))
         (let* ((*default-pathname-defaults*
                 (component-parent-pathname component))
                (name-type
@@ -1065,10 +1068,9 @@ output to *verbose-out*.  Returns the shell's exit code."
     #+sbcl
     (sb-impl::process-exit-code
      (sb-ext:run-program
-      #-win32 "/bin/sh"
-      #+win32 "sh"
+      #+win32 "sh" #-win32 "/bin/sh"
       (list  "-c" command)
-      :search #-win32 nil #+win32 t
+      #+win32 #+win32 :search t
       :input nil :output *verbose-out*))
 
     #+(or cmu scl)
diff --git a/version.lisp-expr b/version.lisp-expr
index 1f7dc93..442dd50 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.11.41"
+"0.9.11.42"