X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fsemi.git;a=blobdiff_plain;f=SEMI-MK;h=482deba3b1793c8169eed9592c763dc9e6988b85;hp=6a0de688bad667cf8559e2c229f488a9a6326672;hb=HEAD;hpb=974eb5256a98baea1fcc96a4289d7566e4e10870

diff --git a/SEMI-MK b/SEMI-MK
index 6a0de68..482deba 100644
--- a/SEMI-MK
+++ b/SEMI-MK
@@ -11,11 +11,6 @@
 	     (defvar PREFIX prefix)
 	     ))
     (setq command-line-args-left (cdr command-line-args-left))
-    (and (setq exec-prefix (car command-line-args-left))
-	 (or (string-equal "NONE" exec-prefix)
-	     (defvar EXEC_PREFIX exec-prefix)
-	     ))
-    (setq command-line-args-left (cdr command-line-args-left))
     (and (setq lisp-dir (car command-line-args-left))
 	 (or (string-equal "NONE" lisp-dir)
 	     (defvar LISPDIR lisp-dir)
@@ -32,8 +27,8 @@
     )
   (load-file "SEMI-CFG")
   (load-file "SEMI-ELS")
-  (princ (format "PREFIX=%s\tEXEC_PREFIX=%s
-LISPDIR=%s\n" PREFIX EXEC_PREFIX LISPDIR))
+  (princ (format "PREFIX=%s
+LISPDIR=%s\n" PREFIX LISPDIR))
   )
 
 (defun directory= (dir1 dir2)
@@ -75,26 +70,34 @@ LISPDIR=%s\n" PREFIX EXEC_PREFIX LISPDIR))
 (defun compile-semi-package ()
   (config-semi-package)
 
-  (setq autoload-package-name "semi")
-  (add-to-list 'command-line-args-left ".")
-  (batch-update-directory)
+  (if (fboundp 'batch-update-directory-autoloads)
+      ;; XEmacs 21.5.19 and newer.
+      (progn
+	(add-to-list 'command-line-args-left ".")
+	(add-to-list 'command-line-args-left "semi")
+	(batch-update-directory-autoloads))
+    (setq autoload-package-name "semi")
+    (add-to-list 'command-line-args-left ".")
+    (batch-update-directory))
 
   (add-to-list 'command-line-args-left ".")
   (Custom-make-dependencies)
 
   (compile-elisp-modules (append semi-modules-to-compile
-				 '(auto-autoloads custom-load))
+				 '(mime-setup auto-autoloads custom-load))
 			 ".")
   )
 
 (defun install-semi-package ()
   (config-semi-package)
   (install-elisp-modules (append semi-modules
-				 '(mime auto-autoloads custom-load))
+				 '(mime-setup auto-autoloads custom-load))
 			 "./"
 			 (expand-file-name SEMI_PREFIX
 					   (expand-file-name "lisp"
 							     PACKAGEDIR)))
+  (delete-file "./auto-autoloads.el")
+  (delete-file "./custom-load.el")
   )
 
 ;;; SEMI-MK ends here