(EMACSLOADPATH): Define.

($(TIT)): 
($(MISC_DIC)): 
(.el.elc): 
(leim-list.el): Remove stuff to set EMACSLOADPATH.

1 files changed, 9 insertions, 10 deletions

diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index e7ea3aa613b..56a3be6f89f 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -36,6 +36,9 @@ buildlisppath=$(CURDIR)/$(dot)$(dot)/lisp
 # How to run Emacs.
 RUN_EMACS = "$(BUILT_EMACS)" -batch --no-init-file --no-site-file --multibyte
 
+# Set EMACSLOADPATH correctly (already defined in environment).
+EMACSLOADPATH=$(buildlisppath)
+
 # Subdirectories to be made if $(srcdir) is different from the current
 # directory.
 SUBDIRS=quail
@@ -148,30 +151,26 @@ $(SUBDIRS):
 
 # Rule to generate quail/*.el from CXTERM-DIC/*.tit.
 $(TIT): $(SUBDIRS)
-        set EMACSLOADPATH=$(buildlisppath)
-        $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+        $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
             --eval $(ARGQUOTE)(batch-titdic-convert t)$(ARGQUOTE) \
             -dir quail $(srcdir)/CXTERM-DIC
-        $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
+        $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
             -f batch-byte-compile $(TIT:.elc=.el)
 
 # Rule to generate quail/*.el from MISC_DIC/*.tit.
 $(MISC_DIC):    $(SUBDIRS)
-        set EMACSLOADPATH=$(buildlisppath)
-        $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
+        $(RUN_EMACS) -l $(buildlisppath)/international/titdic-cnv \
             -f batch-miscdic-convert -dir quail $(srcdir)/MISC-DIC
-        $(SETLOADPATH) $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
+        $(RUN_EMACS)  -l $(buildlisppath)/international/quail \
             -f batch-byte-compile $(MISC_DIC:.elc=.el)
 
 .SUFFIXES: .elc .el
 
 .el.elc:
-        set EMACSLOADPATH=$(buildlisppath)
-        $(SETLOADPATH) $(RUN_EMACS) -f batch-byte-compile $<
+        $(RUN_EMACS) -f batch-byte-compile $<
 
 leim-list.el: $(SUBDIRS) $(WORLD)
-        set EMACSLOADPATH=$(buildlisppath)
-        $(SETLOADPATH) $(RUN_EMACS) -l $(buildlisppath)/international/quail \
+        $(RUN_EMACS) -l $(buildlisppath)/international/quail \
             --eval $(ARGQUOTE)(update-leim-list-file $(DQUOTE).$(DQUOTE))$(ARGQUOTE)
 
 install: all