texinfo update (Fri Mar 25 06:52:01 EST 2005)

[Karl Berry]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/texinfo/texinfo/ChangeLog,v
retrieving revision 1.479
retrieving revision 1.480
diff -c -r1.479 -r1.480
*** ChangeLog   22 Mar 2005 01:29:05 -0000      1.479
--- ChangeLog   25 Mar 2005 11:51:04 -0000      1.480
***************
*** 1,3 ****
--- 1,12 ----
+ 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>
  
        * doc/texinfo.txi (allowcodebreaks): new node.
Index: doc/Makefile.am
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -c -r1.21 -r1.22
*** doc/Makefile.am     25 Jan 2005 16:45:43 -0000      1.21
--- doc/Makefile.am     25 Mar 2005 11:51:05 -0000      1.22
***************
*** 1,4 ****
! # $Id: Makefile.am,v 1.21 2005/01/25 16:45:43 karl Exp $
  # Makefile.am for texinfo/doc.
  # Run automake in .. to produce Makefile.in from this.
  #
--- 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.
  #
***************
*** 60,80 ****
          $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
  
  # The man pages depend on the --help strings and the version number.
- if MAINTAINER_MODE
  common_mandeps = $(top_srcdir)/configure.ac
! info.1: $(top_srcdir)/info/info.c $(common_mandeps)
!       $(HELP2MAN) --name="read Info documents" `basename $@ .1` >$@
! infokey.1: $(top_srcdir)/info/infokey.c $(common_mandeps)
!       $(HELP2MAN) --name="compile customizations for Info" `basename $@ .1` 
>$@
! install-info.1: $(top_srcdir)/util/install-info.c $(common_mandeps)
!       $(HELP2MAN) --name="update info/dir entries" `basename $@ .1` >$@
! makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
!       $(HELP2MAN) --name="translate Texinfo documents" `basename $@ .1` >$@
! texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
!       $(HELP2MAN) --name="print Texinfo documents" `basename $@ .1` >$@
! texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
!       $(HELP2MAN) --name="sort Texinfo index files" `basename $@ .1` >$@
! endif
  
  # Do not create info files for distribution.
  dist-info:
--- 60,101 ----
          $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
  
  # 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:
Index: doc/texi2dvi.1
===================================================================
RCS file: /cvsroot/texinfo/texinfo/doc/texi2dvi.1,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** doc/texi2dvi.1      14 Mar 2005 13:06:23 -0000      1.39
--- doc/texi2dvi.1      25 Mar 2005 11:51:05 -0000      1.40
***************
*** 1,4 ****
! .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.34.
  .TH TEXI2DVI "1" "March 2005" "texi2dvi 1.48" "User Commands"
  .SH NAME
  texi2dvi \- print Texinfo documents
--- 1,4 ----
! .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.35.
  .TH TEXI2DVI "1" "March 2005" "texi2dvi 1.48" "User Commands"
  .SH NAME
  texi2dvi \- print Texinfo documents
P ChangeLog
P doc/Makefile.am
P doc/texi2dvi.1