Merge from trunk.

[bpt/emacs.git] / admin / unidata / Makefile.in

diff --git a/admin/unidata/Makefile.in b/admin/unidata/Makefile.in
index e7b0fbe..c890dad 100644 (file)
--- a/admin/unidata/Makefile.in
+++ b/admin/unidata/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile -- 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
 #
@@ -23,7 +23,7 @@ EMACS = ../../src/emacs
 DSTDIR = ../../lisp/international
 RUNEMACS = ${EMACS} -Q -batch
 
-all: ${DSTDIR}/charprop.el ../../src/biditype.h ../../src/bidimirror.h
+all: ${DSTDIR}/charprop.el
 
 .el.elc:
        ${RUNEMACS} -batch -f batch-byte-compile $<
@@ -33,15 +33,10 @@ unidata.txt: UnicodeData.txt
 
 ${DSTDIR}/charprop.el: unidata-gen.elc unidata.txt
        ELC=`/bin/pwd`/unidata-gen.elc; \
-       DATA=`/bin/pwd`/unidata.txt; \
+       DATADIR=`/bin/pwd`; \
+       DATA=unidata.txt; \
        cd ${DSTDIR}; \
-       ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATA}
-
-../../src/biditype.h: UnicodeData.txt
-       gawk -F";" -f biditype.awk $< > $@
-
-../../src/bidimirror.h: BidiMirroring.txt
-       gawk -F"[; ]+" -f bidimirror.awk $< > $@
+       ${RUNEMACS} -batch --load $${ELC} -f unidata-gen-files $${DATADIR} $${DATA}
 
 install: charprop.el
        cp charprop.el ${DSTDIR}