[Emacs-diffs] /srv/bzr/emacs/trunk r105013: admin/unidata/makefile.w32-in: Duplicate change in Makefile.in (revno:105007).

[Juanma Barranquero]

------------------------------------------------------------
revno: 105013
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-07 15:55:12 +0200
message:
  admin/unidata/makefile.w32-in: Duplicate change in Makefile.in (revno:105007).
modified:
  admin/ChangeLog
  admin/unidata/makefile.w32-in

=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog   2011-07-06 22:43:48 +0000
+++ b/admin/ChangeLog   2011-07-07 13:55:12 +0000
@@ -1,3 +1,8 @@
+2011-07-07  Juanma Barranquero  <address@hidden>
+
+       * unidata/makefile.w32-in (charprop-SH, charprop-CMD):
+       Duplicate change in Makefile.in (revno:105007).
+
 2011-07-06  Kenichi Handa  <address@hidden>
 
        * 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  <address@hidden>

=== modified file 'admin/unidata/makefile.w32-in'
--- a/admin/unidata/makefile.w32-in     2011-01-14 17:18:41 +0000
+++ b/admin/unidata/makefile.w32-in     2011-07-07 13:55:12 +0000
@@ -41,12 +41,13 @@
 
 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)