XEmacs 21.2.36 "Notos"

[chise/xemacs-chise.git.1] / lisp / package-admin.el

diff --git a/lisp/package-admin.el b/lisp/package-admin.el
index dcc62a5..333d303 100644 (file)
--- a/lisp/package-admin.el
+++ b/lisp/package-admin.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1997 by Free Software Foundation, Inc.
 
-;; Author: SL Baur <steve@altair.xemacs.org>
+;; Author: SL Baur <steve@xemacs.org>
 ;; Keywords: internal
 
 ;; This file is part of XEmacs.
@@ -38,7 +38,9 @@
 (defvar package-admin-temp-buffer "*Package Output*"
   "Temporary buffer where output of backend commands is saved.")
 
-(defvar package-admin-install-function 'package-admin-default-install-function
+(defvar package-admin-install-function (if (eq system-type 'windows-nt)
+                                          'package-admin-install-function-mswindows
+                                        'package-admin-default-install-function)
   "The function to call to install a package.
 Three args are passed: FILENAME PKG-DIR BUF
 Install package FILENAME into directory PKG-DIR, with any messages output
@@ -126,7 +128,7 @@ The optional `pkg-dir' can be used to override the default package hierarchy
   (let ((default-directory (file-name-as-directory pkg-dir)))
     (unless (file-directory-p default-directory)
       (make-directory default-directory t))
-    (call-process "djtar" nil buf t "-x" file)))
+    (call-process "minitar" nil buf t file)))
 
 (defun package-admin-default-install-function (file pkg-dir buf)
   "Default function to install a package.
@@ -164,7 +166,7 @@ or return a location appropriate for the package otherwise."
                 (setq autoload-dir (feature-file package-feature))
                 (setq autoload-dir (file-name-directory autoload-dir))
                 (member autoload-dir late-package-load-path))
-       ;; Find the corresonding entry in late-package
+       ;; Find the corresponding entry in late-package
        (setq pkg-dir
              (car-safe (member-if (lambda (h)
                           (string-match (concat "^" (regexp-quote h))
@@ -175,7 +177,9 @@ or return a location appropriate for the package otherwise."
        ;; Ok we need to guess
        (if mule-related
            (package-admin-get-install-dir 'mule-base nil nil)
-         (car (last late-packages)))))))
+         (if (eq package 'xemacs-base)
+             (car (last late-packages))
+           (package-admin-get-install-dir 'xemacs-base nil nil)))))))
          
 
 
@@ -437,7 +441,8 @@ PACKAGE is a symbol, not a string."
            ;; Delete empty directories.
            (if dirs
                (let ( (orig-default-directory default-directory)
-                      directory files file )
+                      ;; directory files file
+                      )
                  ;; Make sure we preserve the existing `default-directory'.
                  ;; JV, why does this change the default directory? Does it indeed?
                  (unwind-protect