1.0.3.33: sb-bsd-sockets fixes for x86-64/darwin

[sbcl.git] / contrib / asdf-install / installer.lisp

diff --git a/contrib/asdf-install/installer.lisp b/contrib/asdf-install/installer.lisp
index e20d6cf..0af1455 100644 (file)
--- a/contrib/asdf-install/installer.lisp
+++ b/contrib/asdf-install/installer.lisp
@@ -13,7 +13,8 @@
         (merge-pathnames
          (make-pathname :directory `(:relative ,(pathname-name path)))
          (make-pathname :directory (pathname-directory path)
-                        :host (pathname-host path)))
+                        :host (pathname-host path)
+                        :device (pathname-device path)))
         path)))
 
 (defvar *sbcl-home* (directorify (posix-getenv "SBCL_HOME")))
@@ -255,8 +256,14 @@
       (elt *locations* (1- response)))))
 
 (defparameter *tar-program*
-  (or #+darwin "gnutar"
-      "tar"))
+  ;; Please do not "clean this up" by using a bunch of #+'s and one
+  ;; #-. When the conditional is written this way, adding a new
+  ;; special case only involves one change. If #- is used, two changes
+  ;; are needed. -- JES, 2007-02-12
+  (progn
+    "tar"
+    #+darwin "gnutar"
+    #+(or sunos netbsd) "gtar"))
 
 (defun get-tar-directory (packagename)
   (let* ((tar (with-output-to-string (o)