From 18f72c3b24cd2a9d81e0d50c087fed780c464ff2 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 15 Nov 2002 08:12:12 +0000 Subject: [PATCH] Synch with the flim-1_14 branch. --- ChangeLog | 5 +++++ FLIM-ELS | 2 +- FLIM-MK | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb6faf2..390b170 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-11-15 Yoichi NAKAYAMA + + * FLIM-ELS (flim-version-specific-modules): Don't install mailcap.el. + * FLIM-MK (install-flim): Avoid creating empty directory. + 2002-11-06 Yoichi NAKAYAMA * mime-parse.el (mime-parse-buffer): Require mmbuffer. diff --git a/FLIM-ELS b/FLIM-ELS index 529c5dd..dbf9c6d 100644 --- a/FLIM-ELS +++ b/FLIM-ELS @@ -15,7 +15,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 --- 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 () -- 1.7.10.4