($(TIT)): Set EMACSLOADPATH when running emacs.

(leim-list.el): Ditto.

diff --git a/leim/makefile.nt b/leim/makefile.nt
index 3e49ce20a21dc405e5dd211ab2a79a2a497d5987..b173046d62b9e57cbbcadbeab7192b5b923dd983 100644 (file)
--- a/leim/makefile.nt
+++ b/leim/makefile.nt
@@ -143,12 +143,14 @@ $(SUBDIRS):
 # Rule to generate quail/*.el from CXTERM-DIC/*.tit.
 $(TIT):
        if not exist quail $(MAKE) -f makefile.nt quail
+       set EMACSLOADPATH=$(buildlisppath)
        $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
            --eval "(batch-titdic-convert t)" -dir quail $(srcdir)/CXTERM-DIC
        $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
            -f batch-byte-compile $(TIT)
 
 leim-list.el: $(SUBDIRS) $(WORLD)
+       set EMACSLOADPATH=$(buildlisppath)
        $(RUN_EMACS) -l $(buildlisppath)/international/quail \
            --eval "(update-leim-list-file \".\")"
 

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 9200fd2e79b135003cba4e69eb461a81a3732cfa..b2d1424a09cadf24f0104f90c1146f288d67e8ff 100644 (file)
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -137,14 +137,16 @@ $(SUBDIRS):
 $(TIT):\r
 #      if not exist quail $(MAKE) quail\r
        set emacs_dir=$(INSTALL_DIR)\r
-       $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \\r
+       set EMACSLOADPATH=$(buildlisppath)\r
+       $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \\r
            --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) -dir quail $(srcdir)/CXTERM-DIC\r
-       $(RUN_EMACS)  -l $(buildlisppath)/international/quail \\r
+       $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \\r
            -f batch-byte-compile $(TIT)\r
 \r
 leim-list.el: $(SUBDIRS) $(WORLD)\r
        set emacs_dir=$(INSTALL_DIR)\r
-       $(RUN_EMACS) -l $(buildlisppath)/international/quail \\r
+       set EMACSLOADPATH=$(buildlisppath)\r
+       $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/quail \\r
            --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)\r
 \r
 install: all\r