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

(leim-list.el): Ditto.

2 files changed, 7 insertions, 3 deletions

diff --git a/leim/makefile.nt b/leim/makefile.nt
index 3e49ce20a21..b173046d62b 100644
--- 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 9200fd2e79b..b2d1424a09c 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -137,14 +137,16 @@ $(SUBDIRS):
 $(TIT):

 #       if not exist quail $(MAKE) quail

         set emacs_dir=$(INSTALL_DIR)

-        $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \

+        set EMACSLOADPATH=$(buildlisppath)

+        $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \

             --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) -dir quail $(srcdir)/CXTERM-DIC

-        $(RUN_EMACS)  -l $(buildlisppath)/international/quail \

+        $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \

             -f batch-byte-compile $(TIT)

 

 leim-list.el: $(SUBDIRS) $(WORLD)

         set emacs_dir=$(INSTALL_DIR)

-        $(RUN_EMACS) -l $(buildlisppath)/international/quail \

+        set EMACSLOADPATH=$(buildlisppath)

+        $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/quail \

             --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)

 

 install: all