Merge remote-tracking branch 'remotes/origin/flim-1_14'.

[elisp/flim.git] / FLIM-MK

diff --git a/FLIM-MK b/FLIM-MK
index 68c42d4..6af7c49 100644 (file)
--- a/FLIM-MK
+++ b/FLIM-MK
@@ -33,8 +33,9 @@ LISPDIR=%s\n" PREFIX LISPDIR))))
 
 (defun install-flim ()
   (config-flim)
-  (install-elisp-modules flim-version-specific-modules "./"
-                        FLIM_VERSION_SPECIFIC_DIR)
+  (if flim-version-specific-modules
+      (install-elisp-modules flim-version-specific-modules "./"
+                            FLIM_VERSION_SPECIFIC_DIR))
   (install-elisp-modules flim-modules "./" FLIM_DIR))
 
 (defun check-flim ()
@@ -68,9 +69,15 @@ LISPDIR=%s\n" PREFIX LISPDIR))))
 (defun compile-flim-package ()
   (config-flim-package)
 
-  (setq autoload-package-name "flim")
-  (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 "flim")
+       (batch-update-directory-autoloads))
+    (setq autoload-package-name "flim")
+    (add-to-list 'command-line-args-left ".")
+    (batch-update-directory))
 
   (add-to-list 'command-line-args-left ".")
   (Custom-make-dependencies)