Synch with flim-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index 8da9a18..e5a3ea2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-12  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * FLIM-MK (compile-flim-package): Use
+       batch-update-directory-autoloads if it is available instead of
+       batch-update-directory.
+
 2006-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * FLIM-CFG (PACKAGEDIR): Check for

diff --git a/FLIM-MK b/FLIM-MK
index 8415fd1..6af7c49 100644 (file)
--- a/FLIM-MK
+++ b/FLIM-MK
@@ -69,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)