texinfo ChangeLog NEWS util/Makefile.am

[karl]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     karl <karl>     13/01/02 02:47:36

Modified files:
        .              : ChangeLog NEWS 
        util           : Makefile.am 

Log message:
        try skipping texinfo.cat altogether

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1492&r2=1.1493
http://cvs.savannah.gnu.org/viewcvs/texinfo/NEWS?cvsroot=texinfo&r1=1.222&r2=1.223
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/Makefile.am?cvsroot=texinfo&r1=1.56&r2=1.57

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1492
retrieving revision 1.1493
diff -u -b -r1.1492 -r1.1493
--- ChangeLog   2 Jan 2013 01:29:09 -0000       1.1492
+++ ChangeLog   2 Jan 2013 02:47:35 -0000       1.1493
@@ -1,5 +1,10 @@
 2013-01-01  Karl Berry  <address@hidden>
 
+       * pretest 4.13.92.
+
+       * util/Makefile.am (texinfo.cat): remove rule and references;
+       not aware of anything using it, current rule fails distcheck.
+
        * util/tests: move the TeX-related tests (all unused) here
        from util/.
 

Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -b -r1.222 -r1.223
--- NEWS        29 Dec 2012 17:06:06 -0000      1.222
+++ NEWS        2 Jan 2013 02:47:35 -0000       1.223
@@ -1,9 +1,9 @@
-$Id: NEWS,v 1.222 2012/12/29 17:06:06 karl Exp $
+$Id: NEWS,v 1.223 2013/01/02 02:47:35 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
   Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+  2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
   Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
@@ -110,6 +110,7 @@
     http://ftpmirror.gnu.org/texinfo/htmlxref.cnf.
   . language support for no removed/renamed to nb, per Norwegian translators.
   . new translations: id it.
+  . texinfo.cat file removed since it is (to our knowledge) unused.
   . documentation license now GFDLv1.3 or later.
   . autoconf 2.69, automake 1.13, gettext 0.18.2.
 

Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- util/Makefile.am    2 Jan 2013 01:22:17 -0000       1.56
+++ util/Makefile.am    2 Jan 2013 02:47:35 -0000       1.57
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.56 2013/01/02 01:22:17 karl Exp $
+# $Id: Makefile.am,v 1.57 2013/01/02 02:47:35 karl Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -44,10 +44,15 @@
   -DLOCALEDIR=\"$(localedir)\"
 LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 
-dist_pkgdata_DATA = htmlxref.cnf texinfo.dtd texinfo.cat
+dist_pkgdata_DATA = htmlxref.cnf texinfo.dtd #texinfo.cat
 
-texinfo.cat: texinfo-cat.in Makefile
-       sed 's/__VERSION__/$(TEXINFO_DTD_VERSION)/g' $(srcdir)/texinfo-cat.in 
>$@
+# This fails distcheck:
+#texinfo.cat: texinfo-cat.in Makefile
+#      sed 's/__VERSION__/$(TEXINFO_DTD_VERSION)/g' $(srcdir)/texinfo-cat.in 
>$@
+# used to be:
+#texinfo.cat: texinfo-cat.in $(top_srcdir)/doc/version.texi
+#      sed 's/__VERSION__/@VERSION@/g' $(srcdir)/texinfo-cat.in >$@
+# Let's try just getting rid of it; not aware of its being used.
 
 # Most of these are for fun.  The only official/installed ones are the
 # *texi2* scripts.
@@ -58,6 +63,6 @@
   texi2dvi texi2pdf \
   $(dist_pkgdata_DATA) texinfo-cat.in texi-elements-by-size \
   texi2html txixml2texi.pl $(w32_bat) \
-tests  
+  tests  
 
 DISTCLEANFILES = txixml2texi