X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/c05c21ed109720d66c834a0c5b21ea29416683a6..230c010050f424cee81c3bcf00b0f00a65819dcb:/admin/unidata/makefile.w32-in

diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 85dfb135df..0e9b9f0d2b 100644
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -1,5 +1,5 @@
 # makefile.w32-in -- W32 -*- Makefile -*- to generate character property tables.
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 #
@@ -27,9 +27,9 @@ lisp = $(CURDIR)/../../lisp
 # 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
+RUNEMACS = "$(EMACS)" -Q -batch
 
-all: $(DSTDIR)/charprop.el ../../src/biditype.h ../../src/bidimirror.h
+all: $(DSTDIR)/charprop.el
 
 .el.elc:
 	$(RUNEMACS) -f batch-byte-compile $<
@@ -41,25 +41,16 @@ unidata.txt: UnicodeData.txt
 
 charprop-SH: unidata-gen.elc unidata.txt
 	ELC=$(CURDIR)/unidata-gen.elc; \
-	DATA=$(CURDIR)/unidata.txt; \
+	DATADIR=$(CURDIR); \
+	DATA=unidata.txt; \
 	cd $(DSTDIR); \
-	  $(RUNEMACS) --load $${ELC} -f unidata-gen-files $${DATA}
+	  $(RUNEMACS) --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA}
 
 charprop-CMD: unidata-gen.elc unidata.txt
-	$(RUNEMACS) --eval $(ARGQUOTE)(cd $(DQUOTE)$(DSTDIR)$(DQUOTE))$(ARGQUOTE) --load $(CURDIR)/unidata-gen.elc -f unidata-gen-files $(CURDIR)/unidata.txt
+	$(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)
 
-../../src/biditype.h: UnicodeData.txt
-	gawk -F";" -f biditype.awk -v BINMODE=2 $< > biditype.h
-	$(CP) biditype.h $@
-	$(DEL) biditype.h
-
-../../src/bidimirror.h: BidiMirroring.txt
-	gawk -F"[; ]+" -f bidimirror.awk -v BINMODE=2 $< > bidimirror.h
-	$(CP) bidimirror.h $@
-	$(DEL) bidimirror.h
-
 clean:
-	- $(DEL) unidata-gen.elc unidata.txt biditype.h bidimirror.h
+	- $(DEL) unidata-gen.elc unidata.txt