2009-10-01 Carsten Dominik <carsten.dominik@gmail.com>

[bpt/emacs.git] / admin / unidata / makefile.w32-in

diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in
index 6135a5a..792c2c2 100644 (file)
--- a/admin/unidata/makefile.w32-in
+++ b/admin/unidata/makefile.w32-in
@@ -1,14 +1,14 @@
 # makefile.w32-in -- W32 -*- Makefile -*- to generate character property tables.
-# Copyright (C) 2005, 2006, 2007, 2008
+# Copyright (C) 2005, 2006, 2007, 2008, 2009
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H13PRO009
 #
 # This file is part of GNU Emacs.
 
-# GNU Emacs is free software; you can redistribute it and/or modify
+# GNU Emacs is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
 # GNU Emacs is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,13 +16,16 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with GNU Emacs; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
+# along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
 
 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 +35,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; \