Synch with the flim-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index 35dd964..3dce9d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-15  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+       * FLIM-ELS (flim-version-specific-modules): Don't install mailcap.el.
+       * FLIM-MK (install-flim): Avoid creating empty directory.
+
 2002-11-06  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
        * mime-parse.el (mime-parse-buffer): Require mmbuffer.

diff --git a/FLIM-ELS b/FLIM-ELS
index 2f8b316..86bed66 100644 (file)
--- a/FLIM-ELS
+++ b/FLIM-ELS
@@ -16,7 +16,7 @@
                     md4 ntlm sasl-ntlm sasl-scram
                     smtp qmtp smtpmail))
 
-(setq flim-version-specific-modules '(mailcap))
+(setq flim-version-specific-modules nil)
 
 (setq hmac-modules '(hex-util
                     hmac-def md5 sha1

diff --git a/FLIM-MK b/FLIM-MK
index 68c42d4..8415fd1 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 ()