diff -urN emacs-20.6/leim/ChangeLog emacs-20.6.92/leim/ChangeLog
--- emacs-20.6/leim/ChangeLog	Sat Feb 26 21:29:30 2000
+++ emacs-20.6.92/leim/ChangeLog	Wed May 24 20:20:00 2000
@@ -1,3 +1,9 @@
+2000-05-23  Andrew Innes  <andrewi@gnu.org>
+
+	* makefile.nt ($(TIT)): Set emacs_dir in the environment before
+	running emacs, to ensure load-path is correct.
+	(leim-list.el): Ditto.
+
 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
 
 	* Version 20.6 released.
diff -urN emacs-20.6/leim/makefile.nt emacs-20.6.92/leim/makefile.nt
--- emacs-20.6/leim/makefile.nt	Mon Nov 22 23:47:34 1999
+++ emacs-20.6.92/leim/makefile.nt	Wed May 24 20:19:35 2000
@@ -143,12 +143,14 @@
 # Rule to generate quail/*.el from CXTERM-DIC/*.tit.
 $(TIT):
 	if not exist quail $(MAKE) -f makefile.nt quail
+	set emacs_dir=$(INSTALL_DIR)
 	$(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 emacs_dir=$(INSTALL_DIR)
 	$(RUN_EMACS) -l $(buildlisppath)/international/quail \
 	    --eval "(update-leim-list-file \".\")"