Supply srcdir to riece-examine-modules.

diff --git a/lisp/COMPILE b/lisp/COMPILE
index 7c28205..199f988 100644 (file)
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -176,7 +176,9 @@
            (mapcar #'car riece-addon-modules))))
 
 (defun riece-examine ()
            (mapcar #'car riece-addon-modules))))
 
 (defun riece-examine ()

-  (princ (mapconcat #'symbol-name (riece-examine-modules) " ")))
+  (princ (mapconcat #'symbol-name
+                   (riece-examine-modules (car command-line-args-left))
+                   " ")))

 
 (defun riece-update-mcat ()
   (let* ((srcdir (car command-line-args-left))
 
 (defun riece-update-mcat ()
   (let* ((srcdir (car command-line-args-left))


@@ -234,29 +236,40 @@
     (setq command-line-args-left (cdr command-line-args-left))))
 
 (defun riece-compile-package ()
     (setq command-line-args-left (cdr command-line-args-left))))
 
 (defun riece-compile-package ()

-  (setq autoload-package-name "riece")
-  (add-to-list 'command-line-args-left ".")
-  (batch-update-directory)
-  (add-to-list 'command-line-args-left ".")
-  (Custom-make-dependencies)
-  (riece-compile-modules
-   (append (riece-examine-modules)
-          '(auto-autoloads custom-load))))
+  (let ((srcdir (car command-line-args-left)))
+    (setq command-line-args-left (cdr command-line-args-left))
+    (if (fboundp 'batch-update-directory-autoloads)
+       (let ((command-line-args-left (list srcdir "riece")))
+         (batch-update-directory-autoloads))
+      (let ((command-line-args-left (list srcdir)))
+       (setq autoload-package-name "riece")
+       (batch-update-autoloads)))
+    (let ((command-line-args-left (list srcdir)))
+      (Custom-make-dependencies))
+    (riece-compile-modules
+     (append (riece-examine-modules srcdir)
+            '(auto-autoloads custom-load))
+     srcdir)))

 
 (defun riece-install-package ()
 
 (defun riece-install-package ()

-  (riece-install-modules
-   (append (riece-examine-modules)
-          '(auto-autoloads custom-load))
-   (expand-file-name "lisp/riece" (car command-line-args-left))
-   (riece-install-just-print-p))
-  (riece-install-icons
-   riece-icons
-   (expand-file-name "etc/riece" (car command-line-args-left))
-   (riece-install-just-print-p))
-  (riece-install-scripts
-   riece-scripts
-   (expand-file-name "etc/riece" (car command-line-args-left))
-   (riece-install-just-print-p)))
+  (let ((srcdir (car command-line-args-left)))
+    (setq command-line-args-left (cdr command-line-args-left))
+    (riece-install-modules
+     (append (riece-examine-modules srcdir)
+            '(auto-autoloads custom-load))
+     srcdir
+     (expand-file-name "lisp/riece" (car command-line-args-left))
+     (riece-install-just-print-p))
+    (riece-install-icons
+     riece-icons
+     srcdir
+     (expand-file-name "etc/riece" (car command-line-args-left))
+     (riece-install-just-print-p))
+    (riece-install-scripts
+     riece-scripts
+     srcdir
+     (expand-file-name "etc/riece" (car command-line-args-left))
+     (riece-install-just-print-p))))

 
 (defun riece-test ()
   (let* ((srcdir (car command-line-args-left))
 
 (defun riece-test ()
   (let* ((srcdir (car command-line-args-left))

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ded477f..3b4ea1d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-20  Daiki Ueno  <ueno@unixuser.org>
+
+       * COMPILE (riece-examine): Supply srcdir to riece-examine-modules.
+       (riece-compile-package): Ditto.
+       (riece-install-package): Ditto.
+

 2010-12-16  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-shrink-buffer.el (riece-shrink-buffer): Make sure not to
 2010-12-16  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-shrink-buffer.el (riece-shrink-buffer): Make sure not to

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index 8e996d7..b7ad0c7 100644 (file)
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -46,11 +46,12 @@ uninstall:
                $(lispdir)
 
 package:
                $(lispdir)
 
 package:

-       $(XEMACS) $(FLAGS) -l $(srcdir)/COMPILE -f riece-compile-package
+       $(XEMACS) $(FLAGS) -l $(srcdir)/COMPILE -f riece-compile-package \
+               $(srcdir)

 
 install-package: package
        $(XEMACS) $(FLAGS) -l $(srcdir)/COMPILE -f riece-install-package \
 
 install-package: package
        $(XEMACS) $(FLAGS) -l $(srcdir)/COMPILE -f riece-install-package \

-               $(PACKAGEDIR) # $(MAKE)
+               $(srcdir) $(PACKAGEDIR) # $(MAKE)

 
 check-local:
        $(EMACS) $(FLAGS) -l $(srcdir)/COMPILE -f riece-test \
 
 check-local:
        $(EMACS) $(FLAGS) -l $(srcdir)/COMPILE -f riece-test \