texinfo README.dev ChangeLog autogen.sh man/Mak...

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/10/25 23:22:08

Modified files:
        .              : README.dev ChangeLog autogen.sh 
        man            : Makefile.am 
        tp             : Makefile.am 
        util           : Makefile.am 

Log message:
        restore maintainer mode, and rebuild Makefile fragments conditionally

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/README.dev?cvsroot=texinfo&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1273&r2=1.1274
http://cvs.savannah.gnu.org/viewcvs/texinfo/autogen.sh?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/Makefile.am?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Makefile.am?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/Makefile.am?cvsroot=texinfo&r1=1.37&r2=1.38

Patches:
Index: README.dev
===================================================================
RCS file: /sources/texinfo/texinfo/README.dev,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- README.dev  16 Oct 2011 23:14:08 -0000      1.19
+++ README.dev  25 Oct 2011 23:22:06 -0000      1.20
@@ -1,4 +1,4 @@
-$Id: README.dev,v 1.19 2011/10/16 23:14:08 karl Exp $
+$Id: README.dev,v 1.20 2011/10/25 23:22:06 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 CFLAGS='-g -Wdeclaration-after-statement'
+ ./configure --enable-maintainer-mode CFLAGS='-g -Wdeclaration-after-statement'
 and then
  make
 

Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1273
retrieving revision 1.1274
diff -u -b -r1.1273 -r1.1274
--- ChangeLog   22 Oct 2011 23:16:55 -0000      1.1273
+++ ChangeLog   25 Oct 2011 23:22:06 -0000      1.1274
@@ -1,3 +1,15 @@
+2011-10-25  Karl Berry  <address@hidden>
+
+       * man/Makefile.am (EXTRA_DIST): add ginfo.h2m.
+       * configure.ac (AM_MAINTAINER_MODE): reenable.
+       * tp/Makefile.am (Makefile.tres): only rebuild the fragment
+       in maintainer mode.
+       * util/Makefile.am (texinfo.cat) [MAINTAINER_MODE]: make conditional.
+       (dist_pkgdata_DATA): add texinfo.cat to here, and remove
+       now-empty pkgdata_DATA.
+       * README.dev,
+       * autogen.sh: mention --enable-maintainer-mode.
+
 2011-10-22  Karl Berry  <address@hidden>
 
        * man/Makefile.am (man_rule_0): only ginfo, not ginfokey.

Index: autogen.sh
===================================================================
RCS file: /sources/texinfo/texinfo/autogen.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- autogen.sh  17 Oct 2011 17:49:07 -0000      1.7
+++ autogen.sh  25 Oct 2011 23:22:07 -0000      1.8
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: autogen.sh,v 1.7 2011/10/17 17:49:07 karl Exp $
+# $Id: autogen.sh,v 1.8 2011/10/25 23:22:07 karl Exp $
 # Created 2003-08-29, Karl Berry.  Public domain.
 
 if test "x$1" = x-n; then
@@ -28,9 +28,9 @@
 : ${AUTOMAKE=automake}
 : ${AUTOCONF=autoconf}
 cmd="$ACLOCAL -I gnulib/m4 && $AUTOCONF && $AUTOHEADER && $AUTOMAKE"
-echo "  $cmd"
-$chicken eval $cmd || exit 1
+echo "  $cmd $*"
+$chicken eval $cmd "$@" || exit 1
 
 echo
 echo "Now run configure with your desired options, for instance:"
-echo "  ./configure CFLAGS='-g'"
+echo "  ./configure --enable-maintainer-mode CFLAGS='-g'"

Index: man/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/man/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- man/Makefile.am     22 Oct 2011 23:16:55 -0000      1.2
+++ man/Makefile.am     25 Oct 2011 23:22:07 -0000      1.3
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.2 2011/10/22 23:16:55 karl Exp $
+# $Id: Makefile.am,v 1.3 2011/10/25 23:22:07 karl Exp $
 # Makefile.am for texinfo/man.
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -21,6 +21,8 @@
 # These are just .so's to the common program.
 man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
 
+EXTRA_DIST = $(man_MANS) ginfo.h2m
+
 # Maintainers should be able to regenerate.
 MAINTAINERCLEANFILES = $(man_MANS)
 

Index: tp/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- tp/Makefile.am      17 Oct 2011 17:49:07 -0000      1.11
+++ tp/Makefile.am      25 Oct 2011 23:22:07 -0000      1.12
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.11 2011/10/17 17:49:07 karl Exp $
+# $Id: Makefile.am,v 1.12 2011/10/25 23:22:07 karl Exp $
 # Makefile.am for texinfo/tp.
 #
 # Copyright 2011 Free Software Foundation, Inc.
@@ -13,8 +13,11 @@
 
 # A long list of files that we generate.
 include $(srcdir)/Makefile.tres
+
+if MAINTAINER_MODE
 $(srcdir)/Makefile.tres: maintain/regenerate_file_lists.pl
        cd $(srcdir)/ && $(PERL) ./maintain/regenerate_file_lists.pl
+endif
 
 bin_SCRIPTS = texi2any
 

Index: util/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/util/Makefile.am,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- util/Makefile.am    25 Jul 2010 16:59:42 -0000      1.37
+++ util/Makefile.am    25 Oct 2011 23:22:07 -0000      1.38
@@ -1,8 +1,8 @@
-# $Id: Makefile.am,v 1.37 2010/07/25 16:59:42 karl Exp $
+# $Id: Makefile.am,v 1.38 2011/10/25 23:22:07 karl Exp $
 # Makefile.am for texinfo/util.
 # Run automake in .. to produce Makefile.in from this.
 #
-# Copyright 2005, 2006, 2007, 2008, 2009, 2010
+# Copyright 2005, 2006, 2007, 2008, 2009, 2010, 2011
 # Free Software Foundation, Inc.
 #
 # This file is free software; as a special exception the author gives
@@ -28,13 +28,14 @@
   -DLOCALEDIR=\"$(localedir)\"
 LDADD = ../lib/libtxi.a $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL)
 
-dist_pkgdata_DATA = htmlxref.cnf texinfo.dtd texinfo.xsl
-pkgdata_DATA = texinfo.cat
+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.
@@ -44,7 +45,6 @@
   install-info-html outline.gawk pdftexi2dvi \
   prepinfo.awk tex3patch texi-docstring-magic.el texi2dvi texi2pdf txitextest \
   $(dist_pkgdata_DATA) texinfo-cat.in
-CLEANFILES = $(pkgdata_DATA)
 
 
 # We must not stress people's TeX installations.