X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-install%2Finstaller.lisp;h=0af1455edce4bd51c6725633457a0e7b32b6e910;hb=faaefce871eb7e00b0c9d23321e5cdfce25f418d;hp=e20d6cf3c6ccc485fe3a3943797b0bcce958aaac;hpb=68ea71d0f020f2726e3c56c1ec491d0af734b3a4;p=sbcl.git diff --git a/contrib/asdf-install/installer.lisp b/contrib/asdf-install/installer.lisp index e20d6cf..0af1455 100644 --- 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)