Synch with flim-1_14 branch.

diff --git a/ChangeLog b/ChangeLog
index ea6091f..d476c95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
+
+       * README.ja, README.en (Installation): Update required version of
+       APEL to 10.7 or later.
+
+       * FLIM-CFG (PACKAGEDIR): Use
+       `install-get-default-package-directory'.
+
 2006-12-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * FLIM-CFG (PACKAGEDIR): Avoid an error with Emacs.

diff --git a/FLIM-CFG b/FLIM-CFG
index ad93717..3878aca 100644 (file)
--- a/FLIM-CFG
+++ b/FLIM-CFG
@@ -61,28 +61,6 @@
       (expand-file-name FLIM_PREFIX VERSION_SPECIFIC_LISPDIR))
 
 (defvar PACKAGEDIR
-  (let ((dirs (append
-              (cond ((boundp 'early-package-hierarchies)
-                     (append (if early-package-load-path
-                                 early-package-hierarchies)
-                             (if late-package-load-path
-                                 late-package-hierarchies)
-                             (if last-package-load-path
-                                 last-package-hierarchies)))
-                    ((boundp 'early-packages)
-                     (append (if early-package-load-path
-                                 early-packages)
-                             (if late-package-load-path
-                                 late-packages)
-                             (if last-package-load-path
-                                 last-packages))))
-              (if (and (boundp 'configure-package-path)
-                       (listp configure-package-path))
-                  (delete "" configure-package-path))))
-       dir)
-    (while (and (setq dir (car dirs))
-               (not (file-exists-p dir)))
-      (setq dirs (cdr dirs)))
-    dir))
+  (install-get-default-package-directory))
 
 ;;; FLIM-CFG ends here

diff --git a/README.en b/README.en
index da9875d..c3c0d3f 100644 (file)
--- a/README.en
+++ b/README.en
@@ -44,7 +44,7 @@ What's FLIM
 Installation
 ============
 
-(0) before installing it, please install APEL (9.22 or later) package.
+(0) before installing it, please install APEL (10.7 or later) package.
     APEL package is available at:
 
        ftp://ftp.m17n.org/pub/mule/apel/

diff --git a/README.ja b/README.ja
index b9592ba..619a3e0 100644 (file)
--- a/README.ja
+++ b/README.ja
@@ -39,10 +39,10 @@ FLIM \e$B$H$O!)\e(B
        XEmacs 21.1 \e$B0J9_\e(B
 
 
-\e$BF3F~\e(B (install)
-==============
+\e$BF3F~\e(B (Installation)
+===================
 
-(0) \e$BF3F~\e(B (install) \e$B$9$kA0$K!"\e(BAPEL (9.22 \e$B0J9_\e(B) \e$B$rF3F~$7$F$/$@$5$$!#\e(BAPEL 
+(0) \e$BF3F~\e(B (install) \e$B$9$kA0$K!"\e(BAPEL (10.7 \e$B0J9_\e(B) \e$B$rF3F~$7$F$/$@$5$$!#\e(BAPEL
     \e$B$O0J2<$N$H$3$m$G<hF@$G$-$^$9\e(B:
 
        ftp://ftp.m17n.org/pub/mule/apel/