X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=SEMI-CFG;h=3d069e5c86802758505f610197ed3ae7608e80c0;hb=59c2dc20c261303c6d051416e38f30ab94cceb39;hp=d56c948b3e955efc8eb0a6139d03c508cb61d43f;hpb=d704b2cb1a50fb910504f5f0e53e6b3479fb212f;p=elisp%2Fsemi.git

diff --git a/SEMI-CFG b/SEMI-CFG
index d56c948..3d069e5 100644
--- a/SEMI-CFG
+++ b/SEMI-CFG
@@ -4,8 +4,6 @@
 
 ;;; Code:
 
-(require 'cl)
-
 (defvar default-load-path load-path)
 
 (add-to-list 'load-path
@@ -13,11 +11,18 @@
 (add-to-list 'load-path
 	     (expand-file-name "." data-directory))
 
-(when (boundp 'LISPDIR)
-  (add-to-list 'default-load-path LISPDIR)
-  (add-to-list 'load-path LISPDIR)
-  (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
-  )
+(if (boundp 'LISPDIR)
+    (progn
+      (add-to-list 'default-load-path LISPDIR)
+      (add-to-list 'load-path LISPDIR)
+      (add-to-list 'load-path (expand-file-name "emu" LISPDIR))
+      (add-to-list 'load-path (expand-file-name "apel" LISPDIR))
+      ))
+
+(defvar VERSION_SPECIFIC_LISPDIR nil)
+
+(if VERSION_SPECIFIC_LISPDIR
+    (add-to-list 'load-path VERSION_SPECIFIC_LISPDIR))
 
 (condition-case nil
     (require 'install)
@@ -50,33 +55,20 @@
 ;; Function `add-path' finds path under load-path directories. If a
 ;; package does not exist in load-path, please specify by absolutely
 ;; (`~/' is available), for example
-;;	(add-path "~/lib/elisp/mailcrypt-3.4")
+;;	(add-path "~/lib/elisp/bbdb")
 ;; or
-;;	(add-path "/opt/share/xmule/site-lisp/mailcrypt-3.4")
-
-
-;;; @@ Please specify Mailcrypt path.
-;;;
-
-;; Use latest version installed in load-path.
-
-(let ((path (get-latest-path "mailcrypt" 'all-paths)))
-  (if path
-      (add-path path)
-    ))
-
-;; Or please specify path.
-;; (add-path "mailcrypt-3.4" 'all-paths)
+;;	(add-path "/opt/share/xmule/site-lisp/bbdb")
 
 
 ;;; @@ Please specify BBDB path.
 ;;;
 
 (let ((path (get-latest-path "bbdb" 'all-paths)))
-  (when path
-    (add-path path)
-    (add-path (expand-file-name "lisp" path)) ; run-in-place installation
-    ))
+  (if path
+      (progn
+	(add-path path)
+	(add-path (expand-file-name "lisp" path)) ; run-in-place installation
+	)))
 
 ;; Or please specify path.
 ;; (add-path "bbdb-1.50" 'all-paths)
@@ -87,26 +79,21 @@
 ;;;
 
 (let ((path (get-latest-path "w3" 'all-paths)))
-  (when path
-    (add-path path)
-    (add-path (expand-file-name "lisp" path)) ; run-in-place installation
-    ))
+  (if path
+      (progn
+	(add-path path)
+	(add-path (expand-file-name "lisp" path)) ; run-in-place installation
+	)))
 
 ;; Or please specify path.
 ;; (add-path "w3-4.0pre.20" 'all-paths)
 
 
-;;; @ shell
+;;;
+;;; @@ Please specify CUSTOM path.
 ;;;
 
-;; Please specify shell command path.
-(setq SHELL
-      (find-if (function file-exists-p)
-	       '("/bin/sh" "/usr/bin/sh")
-	       ))
-
-;; Please specify shell command option.
-(setq SHELLOPTION "-c")
+(add-latest-path "custom")
 
 
 ;;; @ Please specify prefix of install directory.
@@ -117,13 +104,6 @@
 (defvar PREFIX install-prefix)
 ;;(setq PREFIX "~/")
 
-;; Please specify install path prefix for binaries.
-(defvar EXEC_PREFIX
-  (if (or running-emacs-18 running-xemacs)
-      (expand-file-name "../../.." exec-directory)
-    (expand-file-name "../../../.." exec-directory)
-    ))
-
 ;; Please specify emu prefix [optional]
 (setq EMU_PREFIX
       (if (string-match "XEmacs" emacs-version)
@@ -137,9 +117,6 @@
 ;;; @ executables
 ;;;
 
-;; Please specify binary path.
-(defvar BIN_DIR (expand-file-name "bin" EXEC_PREFIX))
-
 ;; Please specify binary path. (for external method scripts)
 (setq METHOD_DIR (expand-file-name "share/semi" PREFIX))
 
@@ -163,4 +140,6 @@
 	"tm-plain" "tm-ps"
 	"tmdecode"))
 
+(defvar PACKAGEDIR (install-get-default-package-directory))
+
 ;;; SEMI-CFG ends here