Merge from emacs--rel--22

[gnu-emacs] / admin / unidata / makefile.w32-in

diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 8e75f07d1821183fa7649cb6260f1b3ecf6329ad..0a933e81d1356a9b5a0c3233f3f780054454cbcd 100644 (file)
--- 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
 
@@ -32,7 +36,9 @@ all: $(DSTDIR)/charprop.el
        $(RUNEMACS) -f batch-byte-compile $<
 
 unidata.txt: UnicodeData.txt
-       sed -e "s/\([^;]*\);\(.*\)/(#x\1 \"\2\")/" -e "s/;/\" \"/g" < $< > $@
+       sed -e \
+         $(ARGQUOTE)s/\([^;]*\);\(.*\)/(#x\1 $(DQUOTE)\2$(DQUOTE))/$(ARGQUOTE)\
+         -e $(ARGQUOTE)s/;/$(DQUOTE) $(DQUOTE)/g$(ARGQUOTE) < UnicodeData.txt > $@
 
 charprop-SH: unidata-gen.elc unidata.txt
        ELC=$(CURDIR)/unidata-gen.elc; \
@@ -41,9 +47,7 @@ charprop-SH: unidata-gen.elc unidata.txt
          $(RUNEMACS) --load $${ELC} -f unidata-gen-files $${DATA}
 
 charprop-CMD: unidata-gen.elc unidata.txt
-       cd $(DSTDIR)
-       $(RUNEMACS) --load $(CURDIR)/unidata-gen.elc -f unidata-gen-files $(CURDIR/unidata.txt
-       cd ../../admin/unidata
+       $(RUNEMACS) --eval $(ARGQUOTE)(cd $(DQUOTE)$(DSTDIR)$(DQUOTE))$(ARGQUOTE) --load $(CURDIR)/unidata-gen.elc -f unidata-gen-files $(CURDIR)/unidata.txt
 
 ${DSTDIR}/charprop.el: charprop-$(SHELLTYPE)