X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/b315b596a90e39717767614c25974f275e7f9f81..a113b3ca322fd73d97d0d9d69c9f48dc13fb326a:/admin/unidata/makefile.w32-in

diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 4a7ba1acb7..0a933e81d1 100644
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -22,7 +22,11 @@
 
 EMACS = ../../src/$(BLD)/emacs.exe
 DSTDIR = ../../lisp/international
-EMACSLOADPATH = $(CURDIR)/../../lisp
+lisp = $(CURDIR)/../../lisp
+# EMACSLOADPATH should include international, so Emacs finds encoded-kb.
+# It should include emacs-lisp, so Emacs finds bytecomp.  This is because
+# lisp/subdirs.el is not generated yet when the commands below run.
+EMACSLOADPATH = $(lisp);$(lisp)/international;$(lisp)/emacs-lisp
 # Quote EMACS so it could be a file name with embedded whitespace
 RUNEMACS = "$(EMACS)" -Q --multibyte -batch
 
@@ -34,7 +38,7 @@ all: $(DSTDIR)/charprop.el
 unidata.txt: UnicodeData.txt
 	sed -e \
 	  $(ARGQUOTE)s/\([^;]*\);\(.*\)/(#x\1 $(DQUOTE)\2$(DQUOTE))/$(ARGQUOTE)\
-	  -e $(ARGQUOTE)s/;/$(DQUOTE) $(DQUOTE)/g$(ARGQUOTE) < $< > $@
+	  -e $(ARGQUOTE)s/;/$(DQUOTE) $(DQUOTE)/g$(ARGQUOTE) < UnicodeData.txt > $@
 
 charprop-SH: unidata-gen.elc unidata.txt
 	ELC=$(CURDIR)/unidata-gen.elc; \