diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2011-07-07 15:55:12 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2011-07-07 15:55:12 +0200 |
| commit | a5b436dff530c418f06e95d6afe61c52c32748a6 (patch) | |
| tree | 2dda4ef7d84fc44d2893cc475144b64a61d492cf /admin | |
| parent | 6870aaefd42b52ada82427a20c3b139a659a35c5 (diff) | |
| download | emacs-a5b436dff530c418f06e95d6afe61c52c32748a6.tar.gz | |
admin/unidata/makefile.w32-in: Duplicate change in Makefile.in (2011-07-06T22:43:48Z!handa@m17n.org).
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/ChangeLog | 11 | ||||
| -rw-r--r-- | admin/unidata/makefile.w32-in | 7 |
2 files changed, 12 insertions, 6 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 3632a0992a6..dbbe38ce617 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,8 @@ +2011-07-07 Juanma Barranquero <lekktu@gmail.com> + + * unidata/makefile.w32-in (charprop-SH, charprop-CMD): + Duplicate change in Makefile.in (2011-07-06T22:43:48Z!handa@m17n.org). + 2011-07-06 Kenichi Handa <handa@m17n.org> * unidata/unidata-gen.el (unidata-dir): New variable. @@ -25,7 +30,7 @@ (unidata-gen-table-decomposition): Likewise. (unidata-describe-general-category): Add the case nil to the description alist. - (unidata-gen-mirroring-list): New funciton. + (unidata-gen-mirroring-list): New function. (unidata-gen-files): New arg DATA-DIR. Adjusted for the change of unidata-prop-alist. Handle the case of storing multiple char-tables in a file. @@ -222,7 +227,7 @@ * unidata/BidiMirroring.txt: New file from http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring-6.0.0d1.txt. - * unidata/Makefile.in: (../../src/bidimirror.h): New target. + * unidata/Makefile.in (../../src/bidimirror.h): New target. (all): Depend on ../../src/biditype.h and ../../src/bidimirror.h. * unidata/makefile.w32-in (../../src/bidimirror.h): New target. @@ -271,7 +276,7 @@ * quick-install-emacs: Use more portable shell syntax. - * quick-install-emacs: (AVOID): Be more picky about files we avoid + * quick-install-emacs (AVOID): Be more picky about files we avoid installing. 2010-02-14 Juanma Barranquero <lekktu@gmail.com> diff --git a/admin/unidata/makefile.w32-in b/admin/unidata/makefile.w32-in index 1f9f276a35c..6a877e0c1d0 100644 --- a/admin/unidata/makefile.w32-in +++ b/admin/unidata/makefile.w32-in @@ -41,12 +41,13 @@ 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) |