texinfo update (Fri Mar 25 09:22:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.480
retrieving revision 1.481
diff -c -r1.480 -r1.481
*** ChangeLog   25 Mar 2005 11:51:04 -0000      1.480
--- ChangeLog   25 Mar 2005 13:55:13 -0000      1.481
***************
*** 1,11 ****
  2005-03-25  Stepan Kasal  <address@hidden>
  
!       * doc/Makefile.am: help2man should use the binaries in the build tree,
!         not the one found on $PATH; thanks to Thomas Schwinge for reporting
!         the problem.  The rules also make sure the binaries are up-to-date,
!         and generate the man pages in the source tree, not build tree.
          There is no need to depend on MAINTAINER_MODE, because help2man is
          handled by the `missing' script.
  
  2005-03-21  Karl Berry  <address@hidden>
  
--- 1,16 ----
  2005-03-25  Stepan Kasal  <address@hidden>
  
!       * doc/Makefile.am: help2man should use the native binaries in the
!         build tree, not the one found on $PATH; thanks to Thomas Schwinge
!         for reporting the problem.
!         The rules also make sure the binaries are up-to-date, and generate
!         the man pages in the source tree, not build tree.
          There is no need to depend on MAINTAINER_MODE, because help2man is
          handled by the `missing' script.
+       (INSTALL_INFO): Comment out; it's not used.
+       * Makefile.am (distcleancheck_listfiles): Removed this variable, it
+         doesn't seem to be needed.
+       * configure.ac (AC_INIT): Add our bug report address.
  
  2005-03-21  Karl Berry  <address@hidden>
  
Index: Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** Makefile.am 15 Dec 2004 16:53:59 -0000      1.13
--- Makefile.am 25 Mar 2005 13:55:14 -0000      1.14
***************
*** 1,5 ****
  # Makefile.am for texinfo.
! # $Id: Makefile.am,v 1.13 2004/12/15 16:53:59 kasal Exp $
  # Process this file with automake to produce Makefile.in in all directories.
  #
  # This file is free software; as a special exception the author gives
--- 1,5 ----
  # Makefile.am for texinfo.
! # $Id: Makefile.am,v 1.14 2005/03/25 13:55:14 kasal Exp $
  # Process this file with automake to produce Makefile.in in all directories.
  #
  # This file is free software; as a special exception the author gives
***************
*** 33,46 ****
    SUBDIRS = $(native_tools) intl m4 lib info makeinfo po util doc
  endif
  
- # for gettext.
  ACLOCAL_AMFLAGS = -I m4
  
- # In case TEXINFO_MAINT is set during make distcheck; in this case, the
- # simple doc-related files generated in info/ make distcleancheck fail.
- distcleancheck_listfiles = \
-   find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
- 
  # One special target for installers to use by hand if desired.
  install-tex:
        cd doc && $(MAKE) TEXMF=$(TEXMF) install-tex
--- 33,40 ----
Index: configure.ac
===================================================================
RCS file: /cvsroot/texinfo/texinfo/configure.ac,v
retrieving revision 1.53
retrieving revision 1.54
diff -c -r1.53 -r1.54
*** configure.ac        16 Mar 2005 13:08:36 -0000      1.53
--- configure.ac        25 Mar 2005 13:55:14 -0000      1.54
***************
*** 1,5 ****
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.53 2005/03/16 13:08:36 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
--- 1,5 ----
  # Process this file with autoconf to produce a configure script.
! # $Id: configure.ac,v 1.54 2005/03/25 13:55:14 kasal Exp $
  #
  # This file is free software; as a special exception the author gives
  # unlimited permission to copy and/or distribute it, with or without
***************
*** 11,17 ****
  #
  AC_PREREQ(2.59)# Minimum Autoconf version required.
  #
! AC_INIT([GNU Texinfo], [4.8])
  AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS.
  AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
  AM_INIT_AUTOMAKE([dist-bzip2])
--- 11,17 ----
  #
  AC_PREREQ(2.59)# Minimum Autoconf version required.
  #
! AC_INIT([GNU Texinfo], [4.8], address@hidden)
  AC_CONFIG_HEADERS(config.h:config.in)# Keep filename to 8.3 for MS-DOS.
  AC_CONFIG_SRCDIR([makeinfo/makeinfo.c])
  AM_INIT_AUTOMAKE([dist-bzip2])
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -c -r1.22 -r1.23
*** doc/Makefile.am     25 Mar 2005 11:51:05 -0000      1.22
--- doc/Makefile.am     25 Mar 2005 13:55:14 -0000      1.23
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.22 2005/03/25 11:51:05 kasal Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 1,4 ----
! # $Id: Makefile.am,v 1.23 2005/03/25 13:55:14 kasal Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
***************
*** 20,26 ****
  # Use the programs built in our distribution, taking account of possible
  # cross-compiling.
  MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
! INSTALL_INFO = $(top_builddir)/$(native_tools)/util/install-info
  
  TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \
            txi-it.tex txi-nl.tex txi-no.tex txi-pl.tex txi-pt.tex txi-tr.tex
--- 20,29 ----
  # Use the programs built in our distribution, taking account of possible
  # cross-compiling.
  MAKEINFO = $(top_builddir)/$(native_tools)/makeinfo/makeinfo
! 
! ## We'd also like to use something like this, but Automake calls
! ## "install-info" directly.
! ## INSTALL_INFO = $(top_builddir)/$(native_tools)/util/ginstall-info
  
  TXI_XLATE = txi-cs.tex txi-de.tex txi-en.tex txi-es.tex txi-fr.tex \
            txi-it.tex txi-nl.tex txi-no.tex txi-pl.tex txi-pt.tex txi-tr.tex
***************
*** 62,101 ****
  # The man pages depend on the --help strings and the version number.
  common_mandeps = $(top_srcdir)/configure.ac
  
! # Rule to update the program:
! man_rule_1 = program=`expr '/$@' : '.*/\(.*\)\.1'` && \
        case $$program in makeinfo) dir=makeinfo;; info*) dir=info;; \
                *) dir=util;; esac && \
        echo cd $(top_builddir)/$$dir '&&' $(MAKE) $(AM_MAKEFLAGS) 
$$program$(EXEEXT) && \
             cd $(top_builddir)/$$dir  &&  $(MAKE) $(AM_MAKEFLAGS) 
$$program$(EXEEXT)
  
! # Rule to generate the page:
! # (We also add $(top_srcdir)/$$dir to the path, because texi2dvi is in source 
tree.)
! man_rule_2 = echo "Updating man page $@" && \
        for dir in util info makeinfo; do \
!       
PATH="$(top_builddir)/address@hidden@$(top_srcdir)/address@hidden@$$PATH"; \
!       done; \
!       $(HELP2MAN) --name="$$name" `expr '/$@' : '.*/\(.*\)\.1'` >$@
  
  $(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
!       @$(man_rule_1)
!       @name="read Info documents" && $(man_rule_2)
  $(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
!       @$(man_rule_1)
!       @name="compile customizations for Info" && $(man_rule_2)
  $(srcdir)/install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps)
!       @$(man_rule_1)
!       @name="update info/dir entries" && $(man_rule_2)
  $(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
!       @$(man_rule_1)
!       @name="translate Texinfo documents" && $(man_rule_2)
  $(srcdir)/texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
!       @$(man_rule_1)
!       @name="sort Texinfo index files" && $(man_rule_2)
  
- # No need for man_rule_1, texi2dvi is in the source tree.
  $(srcdir)/texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
!       @name="print Texinfo documents" && $(man_rule_2)
  
  # Do not create info files for distribution.
  dist-info:
--- 65,111 ----
  # The man pages depend on the --help strings and the version number.
  common_mandeps = $(top_srcdir)/configure.ac
  
! # Set up variables:
! man_rule_0 = echo "Updating man page $@" && \
!       program=`expr '/$@' : '.*/\(.*\)\.1'` && \
        case $$program in makeinfo) dir=makeinfo;; info*) dir=info;; \
                *) dir=util;; esac && \
+       case $$program in info|install-info) program=g$$program;; \
+               esac
+ 
+ # Update the binary:
+ man_rule_1 = \
        echo cd $(top_builddir)/$$dir '&&' $(MAKE) $(AM_MAKEFLAGS) 
$$program$(EXEEXT) && \
             cd $(top_builddir)/$$dir  &&  $(MAKE) $(AM_MAKEFLAGS) 
$$program$(EXEEXT)
  
! # Generate the page:
! # Add $(top_srcdir)/util to the path, because texi2dvi is in source tree.
! man_rule_2 = \
!       PATH="$(top_srcdir)/address@hidden@$$PATH" && \
        for dir in util info makeinfo; do \
!         PATH="$(top_builddir)/$(native_tools)/address@hidden@$$PATH"; \
!       done && \
!       echo PATH="$$PATH" $(HELP2MAN) --name=\"$$name\" $$program '>$@' && \
!       $(HELP2MAN) --name="$$name" $$program >$@
! 
! # Update manpage for a binary program:
! man_rule_bin = $(man_rule_0) && $(man_rule_1) && $(man_rule_2)
! # Update manpage for a script:
! man_rule_scr = $(man_rule_0) && $(man_rule_2)
  
  $(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
!       @name="read Info documents" && $(man_rule_bin)
  $(srcdir)/infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
!       @name="compile customizations for Info" && $(man_rule_bin)
  $(srcdir)/install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps)
!       @name="update info/dir entries" && $(man_rule_bin)
  $(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
!       @name="translate Texinfo documents" && $(man_rule_bin)
  $(srcdir)/texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
!       @name="sort Texinfo index files" && $(man_rule_bin)
  
  $(srcdir)/texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
!       @name="print Texinfo documents" && $(man_rule_scr)
  
  # Do not create info files for distribution.
  dist-info:
P ChangeLog
P Makefile.am
P configure.ac
P doc/Makefile.am
U intl/langprefs.c
U m4/glibc2.m4