tamago-4.0.2

diff --git a/Makefile b/Makefile
index 6307678..3b08948 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,88 +2,88 @@
 
 # Copyright (C) 1999, 2000 Free Software Foundation, Inc
 # Author: NIIBE Yutaka <gniibe@chroot.org>
-#        TOMURA Satoru <tomura@etl.go.jp>
+#         TOMURA Satoru <tomura@etl.go.jp>
 # Maintaner: Satoru Tomura <tomura@etl.go.jp>
 
 #---------------------------------------
 # (1) make
-#      ;; compile *.el files
+#       ;; compile *.el files
 # (2) make install
-#      ;; install files into the emacs site-lisp directory
+#       ;; install files into the emacs site-lisp directory
 #       ;; ex. /usr/local/share/emacs/site-lisp/egg
 #------------------------------------------------
 #  Configuration parameters
 #------------------------------------------------
 # emacs you use
-       EMACS   = /usr/local/bin/emacs
+EMACS  = /usr/local/bin/emacs
 # Programs
-       INSTALL = /usr/sbin/install
-       CP      = /bin/cp
-       MV      = /bin/mv
-       RM      = /bin/rm
-       MKDIR   = /usr/bin/mkdir
+INSTALL        = /usr/sbin/install
+CP     = /bin/cp
+MV     = /bin/mv
+RM     = /bin/rm
+MKDIR  = /usr/bin/mkdir
 #------------------------------------------------
 
-DEPS = -l ./docomp.el
-BATCHFLAGS = -batch -q -no-site-file -no-init-file
+DEPS   = -l ./docomp.el
+BATCHFLAGS     = -batch -q -no-site-file -no-init-file
+
+ETCS   = Makefile docomp.el make-insdirs.el \
+       AUTHORS ChangeLog README TODO PROBLEMS
+
+ELS    = eggrc leim-list.el
+
+SRCS   = egg-util.el \
+       menudiag.el its.el egg-edep.el \
+       its/ascii.el \
+       its/bixing.el \
+       its/erpin.el \
+       its/hankata.el \
+       its/hira.el \
+       its/jeonkak.el \
+       its/pinyin.el \
+       its/hangul.el \
+       its/kata.el \
+       its/thai.el \
+       its/quanjiao.el \
+       its/zenkaku.el \
+       its/zhuyin.el \
+       its-keydef.el \
+       egg-mlh.el egg-cnv.el egg-com.el \
+       egg.el \
+       egg/cannarpc.el egg/canna.el \
+       egg/sj3rpc.el egg/sj3.el \
+       egg/wnnrpc.el egg/wnn.el 
+
+ELCS   = ${SRCS:.el=.elc}
+
+DIST   = ${ETCS} ${SRCS} ${ELS}
 
 .SUFFIXES: .el .elc
 
-ETCS = Makefile docomp.el egg-dotemacs \
-       AUTHORS ChangeLog README TODO PROBLEMS make-dirs.el
-
-ELS  =  eggrc leim-list.el
-
-SRCS = egg-util.el \
-       menudiag.el its.el egg-edep.el \
-       its/ascii.el \
-       its/bixing.el \
-       its/erpin.el \
-       its/hankata.el \
-       its/hira.el \
-       its/jeonkak.el \
-       its/pinyin.el \
-       its/hangul.el \
-       its/kata.el \
-       its/thai.el \
-       its/quanjiao.el \
-       its/zenkaku.el \
-       its/zhuyin.el \
-       its-keydef.el \
-       egg-mlh.el egg-cnv.el egg-com.el \
-       egg.el \
-       egg/cannarpc.el egg/canna.el \
-       egg/sj3rpc.el egg/sj3.el \
-       egg/wnnrpc.el egg/wnn.el 
-
-ELCS = ${SRCS:.el=.elc}
-
-DIST = ${ETCS} ${SRCS} ${ELS}
-
 .el.elc:
        ${EMACS} ${BATCHFLAGS} ${DEPS} -f batch-byte-compile $<
 
-all: ${ELCS} dirs
+all: ${ELCS} insdirs
 
-dirs:  ${EMACS}
-       @${EMACS} ${BATCHFLAGS} -l ./make-dirs.el 2> /dev/null
+insdirs:   ${EMACS}
+       @${EMACS} ${BATCHFLAGS} -l ./make-insdirs.el 2> /dev/null
 
 clean: 
-       ${RM} -f ${ELCS} dirs *~ */*~
+       ${RM} -f ${ELCS} insdirs *~ */*~
 
 install: install-site
 
 install-site: all
-       @. ./dirs; \
+       @. ./insdirs; \
        echo "Egg system will be installed in $${INSDIR}/egg...."; \
        if [ -d $${INSDIR}/egg ]; then \
-           echo "Clean up the previsous installation...."; \
-           ${RM} -rf $${INSDIR}/egg; fi ; \
+         echo "Clean up the previsous installation...."; \
+         ${RM} -rf $${INSDIR}/egg; fi ; \
        mkdir -p $${INSDIR}/egg; \
        tar cf - ${SRCS} ${ELCS} ${ELS} | (cd $${INSDIR}/egg && tar xpBf -)
 
 uninstall-site:
-       . ./dirs; \
+       @. ./insdirs; \
        if [ -d $${INSDIR}/egg ]; then \
          ${RM} -rf $${INSDIR}/egg; \
        fi
@@ -93,8 +93,8 @@ egg/sj3rpc.elc: egg-com.elc egg/sj3.elc
 egg/wnnrpc.elc: egg-com.elc egg/wnn.elc
 
 egg.elc its/ascii.elc its/erpin.elc its/hankata.elc \
-       its/hira.elc its/jeonkak.elc its/pinyin.elc \
-       its/hangul.elc its/kata.elc its/quanjiao.elc \
-       its/zenkaku.elc its/zhuyin.elc: its-keydef.elc
+its/hira.elc its/jeonkak.elc its/pinyin.elc \
+its/hangul.elc its/kata.elc its/quanjiao.elc \
+its/zenkaku.elc its/zhuyin.elc: its-keydef.elc
 
 

diff --git a/egg-util.el b/egg-util.el
index 2bd840f..a730fe3 100644 (file)
--- a/egg-util.el
+++ b/egg-util.el
@@ -46,7 +46,7 @@
        (if path
            (progn
              (setq lpath (cdr-safe 
-                          (member (substring (file-name-directory path) 0 -1)
+                          (member (directory-file-name (file-name-directory path))
                                   lpath))
                    result (cons path result)))
          (progn

diff --git a/leim-list.el b/leim-list.el
index 535c4b1..70393de 100644 (file)
--- a/leim-list.el
+++ b/leim-list.el
@@ -1,9 +1,10 @@
-;;; leim-list-egg.el --- Egg setup for leim API
+;;; leim-list.el --- Egg setup for leim API
 
 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc
 
 ;; Author: NIIBE Yutaka <gniibe@chroot.org>
 ;;         KATAYAMA Yoshio <kate@pfu.co.jp>
+;;         TOMURA Satoru <tomura@etl.go.jp>
 
 ;; Maintainer: TOMURA Satoru <tomura@etl.go.jp>
 
@@ -30,9 +31,6 @@
 
 ;;; Code:
 
-;;; leim-list-egg.el --- Egg setup for leim API
-;;; CAUTION: Don't delete the above line.
-
 (when site-run-file
   (autoload 'egg-activate-wnn "egg/wnn" "Activate Wnn backend of Tamagotchy." t)
   (autoload 'egg-activate-sj3 "egg/sj3" "Activate SJ3 backend of Tamagotchy." t)
@@ -89,20 +87,31 @@
   (set-language-info "Chinese-CNS" 'input-method "chinese-cns-egg-wnn-py")
   (set-language-info "Korean"      'input-method "korean-egg-wnn")
 
-  (require 'egg)
-  (require 'its/hira)
+(defgroup leim nil 
+  "LEIM stands for Libraries of Emacs Input Methods."
+  :group 'mule)
+
+(defgroup egg nil "" 
+  :group 'leim :load "egg")
+
+(defgroup wnn nil ""
+  :group 'egg :load "egg/wnn")
+
+(defgroup its nil "" 
+  :group 'egg :load "its")
+
+(defgroup hira nil ""
+  :group 'its :load "its/hira")
 
 ;;;;
 
   (require 'egg-util)
 
   (defun load-leim-list-except-this ()
-    (load-libraries "leim-list" (cdr-safe
-                                (member (substring 
-                                         (file-name-directory
-                                          load-file-name)
-                                         0 -1)
-                                        load-path))))
+    (load-libraries "leim-list" 
+                   (cdr-safe
+                    (member (directory-file-name (file-name-directory load-file-name))
+                            load-path))))
 
   (message "Finished loading %s \n   and load others..." load-file-name)
   (load-leim-list-except-this)

diff --git a/make-insdirs.el b/make-insdirs.el
new file mode 100644 (file)
index 0000000..0a9719f
--- /dev/null
+++ b/make-insdirs.el
@@ -0,0 +1,50 @@
+;;; make-emacs-conf.el --- 
+
+;; Copyright (C) 2000 ElectroTechnical Laboratory
+;; Copyright (C) 2000 TOMURA Satoru <tomura@etl.go.jp>
+;; Licensed to Free Software Foundation, Inc.
+
+;; Author: TOMURA Satoru <tomura@etl.go.jp>
+
+;; Maintainer: TOMURA Satoru <tomura@etl.go.jp>
+
+;; Keywords: mule, multilingual, input method
+
+;; This file is part of EGG.
+
+;; EGG is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; EGG is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Code:
+
+(defun make-emacs-configuration-file ()
+  (with-temp-buffer
+    (let* ((emacs-etc-directory data-directory)
+          (this-version-directory (file-name-directory (directory-file-name emacs-etc-directory)))
+          (site-directory (file-name-directory (directory-file-name this-version-directory))))
+      (insert 
+       ;;; INSDIR=/usr/local/share/emacs/site-lisp
+       (format "INSDIR=%s\n"
+              (expand-file-name "site-lisp" site-directory)
+              )
+       ;;; VINSDIR=/usr/local/share/emacs/20.5/site-lisp        
+       (format "VINSDIR=%s\n"
+              (expand-file-name "site-lisp" this-version-directory)
+              ))
+      (write-file "insdirs" nil))))
+
+(make-emacs-configuration-file)