texinfo ChangeLog Makefile.am configure.ac

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/10/11 23:37:39

Modified files:
        .              : ChangeLog Makefile.am configure.ac 

Log message:
        prepare for first 4.13.90 pretest

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1259&r2=1.1260
http://cvs.savannah.gnu.org/viewcvs/texinfo/Makefile.am?cvsroot=texinfo&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.102&r2=1.103

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1259
retrieving revision 1.1260
diff -u -b -r1.1259 -r1.1260
--- ChangeLog   1 Oct 2011 23:09:21 -0000       1.1259
+++ ChangeLog   11 Oct 2011 23:37:38 -0000      1.1260
@@ -1,3 +1,13 @@
+2011-10-11  Karl Berry  <address@hidden>
+
+       * configure.ac (AC_INIT): version 4.13.90.
+       (AM_INIT_AUTOMAKE): dist-xz rather than lzma.
+
+       * configure.ac (AC_CONFIG_SRCDIR): look for info.c, not makeinfo.c.
+       (AC_CONFIG_FILES),
+       * Makefile.am (SUBDIRS): remove makeinfo.
+       (DIST_SUBDIRS): no need.
+
 2011-10-01  Patrice Dumas  <address@hidden>
 
        * doc/texinfo.txi (Generic Translator texi2any/makeinfo): adapt to

Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- Makefile.am 25 Sep 2011 22:07:04 -0000      1.30
+++ Makefile.am 11 Oct 2011 23:37:38 -0000      1.31
@@ -1,8 +1,8 @@
-# $Id: Makefile.am,v 1.30 2011/09/25 22:07:04 pertusus Exp $
+# $Id: Makefile.am,v 1.31 2011/10/11 23:37:38 karl Exp $
 # Makefile.am for texinfo.
 # Process this file with automake to produce Makefile.in in all directories.
 #
-# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 # Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
@@ -27,16 +27,16 @@
 
 if TOOLS_ONLY
   # Build native tools only.
-  SUBDIRS = lib info install-info makeinfo tp util
+  SUBDIRS = lib info install-info tp util
 else
   # All subdirectories.
   # Do libs first since the C programs depend on it.
   # Do doc last so makeinfo will be built when we get there.
   # Others are alphabetical.
   SUBDIRS = $(native_tools) gnulib/lib lib \
-            install-info info makeinfo po po_document tp util doc
+            install-info info po po_document tp util \
+           doc
 endif
-DIST_SUBDIRS = $(SUBDIRS) texi2html
 
 # One special target for installers to use by hand if desired.
 install-tex:

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- configure.ac        1 Oct 2011 23:09:22 -0000       1.102
+++ configure.ac        11 Oct 2011 23:37:39 -0000      1.103
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.102 2011/10/01 23:09:22 pertusus Exp $
+# $Id: configure.ac,v 1.103 2011/10/11 23:37:39 karl Exp $
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,19 +9,19 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
-AC_INIT([GNU Texinfo], [4.13], address@hidden)
+AC_INIT([GNU Texinfo], [4.13.90], address@hidden)
 
 dnl Must come before AM_INIT_AUTOMAKE.
 AC_CONFIG_AUX_DIR([build-aux])
 dnl tar-ustar because we have long filenames for some test files
-AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-lzma tar-ustar])
+AM_INIT_AUTOMAKE([1.10.1 readme-alpha dist-xz tar-ustar])
 
 # Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
 # Where to generate output; srcdir location.
 AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
-AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
+AC_CONFIG_SRCDIR([info/info.c])
 
 AM_CONDITIONAL([TEXI2HTML],[false])
 
@@ -361,8 +361,6 @@
   install-info/Makefile
   install-info/tests/Makefile
   lib/Makefile
-  makeinfo/Makefile
-  makeinfo/tests/Makefile
   po/Makefile.in
   po_document/Makefile.in
   util/Makefile