texinfo README.dev autogen.sh configure.ac Chan...

[Karl Berry]

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

Modified files:
        .              : README.dev autogen.sh configure.ac ChangeLog 
        util           : Makefile.am 

Log message:
        back to no AM_MAINTAINER_MODE

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/README.dev?cvsroot=texinfo&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/texinfo/autogen.sh?cvsroot=texinfo&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1274&r2=1.1275
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/Makefile.am?cvsroot=texinfo&r1=1.38&r2=1.39

Patches:
Index: README.dev
===================================================================
RCS file: /sources/texinfo/texinfo/README.dev,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- README.dev  25 Oct 2011 23:22:06 -0000      1.20
+++ README.dev  28 Oct 2011 23:39:09 -0000      1.21
@@ -1,4 +1,4 @@
-$Id: README.dev,v 1.20 2011/10/25 23:22:06 karl Exp $
+$Id: README.dev,v 1.21 2011/10/28 23:39:09 karl Exp $
 This README.dev file describes the development environment.
 
   Copyright 2002, 2003, 2005, 2006, 2007, 2008, 2010, 2011
@@ -21,7 +21,7 @@
 After getting the CVS sources, and installing the tools above, you can run
  ./autogen.sh
 and then
- ./configure --enable-maintainer-mode CFLAGS='-g -Wdeclaration-after-statement'
+ ./configure CFLAGS='-g -Wdeclaration-after-statement'
 and then
  make
 

Index: autogen.sh
===================================================================
RCS file: /sources/texinfo/texinfo/autogen.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- autogen.sh  25 Oct 2011 23:22:07 -0000      1.8
+++ autogen.sh  28 Oct 2011 23:39:10 -0000      1.9
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: autogen.sh,v 1.8 2011/10/25 23:22:07 karl Exp $
+# $Id: autogen.sh,v 1.9 2011/10/28 23:39:10 karl Exp $
 # Created 2003-08-29, Karl Berry.  Public domain.
 
 if test "x$1" = x-n; then
@@ -33,4 +33,4 @@
 
 echo
 echo "Now run configure with your desired options, for instance:"
-echo "  ./configure --enable-maintainer-mode CFLAGS='-g'"
+echo "  ./configure CFLAGS='-g'"

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- configure.ac        21 Oct 2011 18:42:34 -0000      1.106
+++ configure.ac        28 Oct 2011 23:39:11 -0000      1.107
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.106 2011/10/21 18:42:34 karl Exp $
+# $Id: configure.ac,v 1.107 2011/10/28 23:39:11 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
@@ -23,9 +23,10 @@
 AC_CONFIG_HEADERS([config.h:config.in])dnl Keep filename to 8.3 for MS-DOS.
 AC_CONFIG_SRCDIR([info/info.c])
 
+# Conditional texi2html support.
 AM_CONDITIONAL([TEXI2HTML],[false])
 
-dnl Misc variable settings
+# Misc variable settings
 PACKAGE_DATE=`${SHELL} "$srcdir"/build-aux/mdate-sh "$srcdir"/configure.ac`
 AC_SUBST([PACKAGE_DATE])
 

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1274
retrieving revision 1.1275
diff -u -b -r1.1274 -r1.1275
--- ChangeLog   25 Oct 2011 23:22:06 -0000      1.1274
+++ ChangeLog   28 Oct 2011 23:39:11 -0000      1.1275
@@ -1,3 +1,13 @@
+2011-10-28  Karl Berry  <address@hidden>
+
+        Flip-flop again: no maintainer mode.
+       * configure.ac (AM_MAINTAINER_MODE): remove again.
+       * tp/Makefile.am (Makefile.tres): only rebuild the fragment
+       in maintainer mode.
+       * util/Makefile.am (texinfo.cat) [MAINTAINER_MODE]: make conditional.
+       * README.dev,
+       * autogen.sh: mention --enable-maintainer-mode.
+
 2011-10-25  Karl Berry  <address@hidden>
 
        * man/Makefile.am (EXTRA_DIST): add ginfo.h2m.

Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- util/Makefile.am    25 Oct 2011 23:22:07 -0000      1.38
+++ util/Makefile.am    28 Oct 2011 23:39:12 -0000      1.39
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.38 2011/10/25 23:22:07 karl Exp $
+# $Id: Makefile.am,v 1.39 2011/10/28 23:39:12 karl Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
@@ -30,12 +30,10 @@
 
 dist_pkgdata_DATA = htmlxref.cnf texinfo.dtd texinfo.xsl texinfo.cat
 
-if MAINTAINER_MODE
 # 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 >$@
-endif
 
 # Most of these are for fun.  The only official/installed ones are the
 # *texi2* scripts.