texinfo ChangeLog util/Makefile.am

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/12/29 09:42:25

Modified files:
        .              : ChangeLog 
        util           : Makefile.am 

Log message:
                * util/Makefile.am (texinfo.cat): use $(TEXINFO_DTD_VERSION) 
instead
                of @address@hidden  Report from Thien-Thi Nguyen.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1483&r2=1.1484
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/Makefile.am?cvsroot=texinfo&r1=1.52&r2=1.53

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1483
retrieving revision 1.1484
diff -u -b -r1.1483 -r1.1484
--- ChangeLog   22 Dec 2012 22:25:53 -0000      1.1483
+++ ChangeLog   29 Dec 2012 09:42:25 -0000      1.1484
@@ -1,3 +1,7 @@
+2012-12-29  Patrice Dumas  <address@hidden>
+       * util/Makefile.am (texinfo.cat): use $(TEXINFO_DTD_VERSION) instead
+       of @address@hidden  Report from Thien-Thi Nguyen.
+
 2012-12-22  Karl Berry  <address@hidden>
 
        * util/Makefile.am (EXTRA_DIST): add *.bat.  Report from Eli,

Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- util/Makefile.am    22 Dec 2012 22:25:53 -0000      1.52
+++ util/Makefile.am    29 Dec 2012 09:42:25 -0000      1.53
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.52 2012/12/22 22:25:53 karl Exp $
+# $Id: Makefile.am,v 1.53 2012/12/29 09:42:25 pertusus Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -46,10 +46,8 @@
 
 dist_pkgdata_DATA = htmlxref.cnf texinfo.dtd texinfo.xsl texinfo.cat
 
-# we don't actually use version.texi in the rule, but it's one way of
-# noticing when the version changes.
-texinfo.cat: texinfo-cat.in $(top_srcdir)/doc/version.texi
-       sed 's/__VERSION__/@VERSION@/g' $(srcdir)/texinfo-cat.in >$@
+texinfo.cat: texinfo-cat.in Makefile
+       sed 's/__VERSION__/$(TEXINFO_DTD_VERSION)/g' $(srcdir)/texinfo-cat.in 
>$@
 
 # Most of these are for fun.  The only official/installed ones are the
 # *texi2* scripts.