texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo ChangeLog Makefile.am configure.ac doc/...


From: Karl Berry
Subject: texinfo ChangeLog Makefile.am configure.ac doc/...
Date: Fri, 21 Oct 2011 18:42:37 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/10/21 18:42:37

Modified files:
        .              : ChangeLog Makefile.am configure.ac 
        doc            : Makefile.am version.texi 
        tp             : texi2any.pl 
        util           : pdftexi2dvi srclist.txt texi2dvi 
Added files:
        man            : .cvsignore Makefile.am ginfo.h2m info.5 
                         pdftexi2dvi.1 texi2any.1 texi2pdf.1 texinfo.5 
Removed files:
        doc            : info.5 texinfo.5 
        info           : ginfo.h2m 

Log message:
        concentrate man stuff in separate directory

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1270&r2=1.1271
http://cvs.savannah.gnu.org/viewcvs/texinfo/Makefile.am?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/configure.ac?cvsroot=texinfo&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/Makefile.am?cvsroot=texinfo&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version.texi?cvsroot=texinfo&r1=1.101&r2=1.102
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/info.5?cvsroot=texinfo&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.5?cvsroot=texinfo&r1=1.3&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/ginfo.h2m?cvsroot=texinfo&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/.cvsignore?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/Makefile.am?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/ginfo.h2m?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/info.5?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/pdftexi2dvi.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/texi2any.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/texi2pdf.1?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/man/texinfo.5?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/texi2any.pl?cvsroot=texinfo&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/pdftexi2dvi?cvsroot=texinfo&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/srclist.txt?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/util/texi2dvi?cvsroot=texinfo&r1=1.166&r2=1.167

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1270
retrieving revision 1.1271
diff -u -b -r1.1270 -r1.1271
--- ChangeLog   19 Oct 2011 15:56:05 -0000      1.1270
+++ ChangeLog   21 Oct 2011 18:42:34 -0000      1.1271
@@ -1,3 +1,10 @@
+2011-10-21  Karl Berry  <address@hidden>
+
+       * doc/texi2dvi,
+       * tp/texi2any.pl: help message changes to help help2man.
+       * man: new subdirectory.
+       * doc/Makefile.am, doc/*.5, info/ginfo.h2m: move man files.
+
 2011-10-19  Karl Berry  <address@hidden>
 
        * doc/texinfo.tex (\var, \doabbr, \doacronym): reset \spacefactor=1000

Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Makefile.am 17 Oct 2011 00:18:57 -0000      1.32
+++ Makefile.am 21 Oct 2011 18:42:34 -0000      1.33
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.32 2011/10/17 00:18:57 karl Exp $
+# $Id: Makefile.am,v 1.33 2011/10/21 18:42:34 karl Exp $
 # Makefile.am for texinfo.
 # Process this file with automake to produce Makefile.in in all directories.
 #
@@ -31,11 +31,11 @@
 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.
+  # Do doc and man last so makeinfo will be built when we get there.
   # Others are alphabetical.
   SUBDIRS = $(native_tools) gnulib/lib lib \
             install-info info po po_document tp util \
-           doc
+           doc man
 endif
 
 # One special target for installers to use by hand if desired.

Index: configure.ac
===================================================================
RCS file: /sources/texinfo/texinfo/configure.ac,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- configure.ac        13 Oct 2011 17:41:09 -0000      1.105
+++ configure.ac        21 Oct 2011 18:42:34 -0000      1.106
@@ -1,5 +1,5 @@
 # Process this file with autoconf to produce a configure script.
-# $Id: configure.ac,v 1.105 2011/10/13 17:41:09 karl Exp $
+# $Id: configure.ac,v 1.106 2011/10/21 18:42:34 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
@@ -312,6 +312,7 @@
   install-info/Makefile
   install-info/tests/Makefile
   lib/Makefile
+  man/Makefile
   po/Makefile.in
   po_document/Makefile.in
   util/Makefile

Index: doc/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- doc/Makefile.am     13 Oct 2011 00:06:51 -0000      1.44
+++ doc/Makefile.am     21 Oct 2011 18:42:34 -0000      1.45
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.44 2011/10/13 00:06:51 pertusus Exp $
+# $Id: Makefile.am,v 1.45 2011/10/21 18:42:34 karl Exp $
 # Makefile.am for texinfo/doc.
 #
 # Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -16,9 +16,6 @@
 info_TEXINFOS = texinfo.txi info-stnd.texi info.texi
 DISTCLEANFILES = texinfo texinfo-* info*.info*
 
-man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1  \
-           info.5 texinfo.5
-
 # Use the programs built in our distribution, taking account of possible
 # cross-compiling.
 MAKEINFO = $(PERL) -I $(top_srcdir)/tp/ $(top_srcdir)/tp/texi2any.pl
@@ -67,76 +64,5 @@
        for f in $(TXI_XLATE); do \
          $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
 
-# 
-# Make man pages with help2man.
-# They depend on the --help strings and the version number.
-common_mandeps = $(top_srcdir)/configure.ac
-
-# Set up the variables:
-man_rule_0 = \
-       program=`expr '/$@' : '.*/\(.*\)\.1'` && \
-       case $$program in makeinfo) dir=tp;; info*) dir=info;; \
-               *install-info) dir=install-info;; *) dir=util;; esac && \
-       dir="$(top_builddir)/$(native_tools)/$$dir" && \
-       case $$program in info|install-info) program=g$$program;; \
-                         makeinfo) 
PERL5LIB="$(top_srcdir)/tp/:$(top_srcdir)/tp/maintain/lib/libintl-perl/lib:$(top_srcdir)/tp/maintain/lib/Unicode-EastAsianWidth/lib:$(top_srcdir)/tp/maintain/lib/Text-Unidecode/lib:";
 export PERL5LIB;; \
-               esac
-
-# Update the manpage for a binary program; set up the variables,
-# make sure the binary is up-to-date and then generate the man page.
-man_rule_bin = echo "Updating man page $@" && \
-       $(man_rule_0) && \
-       echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
-           (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
-       echo $(HELP2MAN) --name=\""$$name"\" -I "$$dir/$$program.h2m" 
"$$dir/$$program" -o '$@' && \
-            $(HELP2MAN) --name="$$name"     -I "$$dir/$$program.h2m" 
"$$dir/$$program" -o '$@'
-
-# for Info, we have an additional help2man file since the standard
-# SEE ALSO text from help2man does not fit.
-$(srcdir)/info.1: $(top_srcdir)/info/info.c $(top_srcdir)/info/ginfo.h2m \
-                  $(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)/install-info/install-info.c \
-                          $(common_mandeps)
-       @name="update info/dir entries" && $(man_rule_bin)
-
-# Here we need some postprocessing to avoid man misformatting.
-$(srcdir)/makeinfo.1: $(top_srcdir)/tp/texi2any.pl $(common_mandeps)
-       @name="translate Texinfo documents" && $(man_rule_bin)
-       mv $@ address@hidden
-       sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' address@hidden >$@
-       rm address@hidden
-
-$(srcdir)/texindex.1: $(util_srcdir)/texindex.c $(common_mandeps)
-       @name="sort Texinfo index files" && $(man_rule_bin)
-
-
-# 
-# texi2dvi in all its forms.
-
-man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
-util_srcdir = $(top_srcdir)/util
-
-# Do not depend on the current user's settings.
-# We need to include util_srcdir in PATH so texi2pdf can find texi2dvi.
-change_envvars = unset TEXI2DVI_BUILD_MODE; unset TEXI2DVI_BUILD_DIRECTORY; \
-  PATH="$(util_srcdir):$${PATH}"; export PATH
-
-common_texi2dvi_deps = $(common_mandeps) \
-                       $(util_srcdir)/texi2dvi $(util_srcdir)/texi2pdf
-
-$(srcdir)/texi2dvi.1: $(common_texi2dvi_deps)
-       $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to 
DVI" $(util_srcdir)/texi2dvi >$@
-
-$(srcdir)/texi2pdf.1: $(common_texi2dvi_deps)
-       $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to 
PDF" $(util_srcdir)/texi2pdf >$@
-
-$(srcdir)/pdftexi2dvi.1:  $(common_texi2dvi_deps)
-       $(change_envvars); $(HELP2MAN) --name="convert Texinfo documents to 
PDF" $(util_srcdir)/pdftexi2dvi >$@
-
 # Do not create info files for distribution.
 dist-info:

Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -b -r1.101 -r1.102
--- doc/version.texi    17 Oct 2011 00:06:51 -0000      1.101
+++ doc/version.texi    21 Oct 2011 18:42:35 -0000      1.102
@@ -1,4 +1,4 @@
address@hidden UPDATED 16 October 2011
address@hidden UPDATED 19 October 2011
 @set UPDATED-MONTH October 2011
 @set EDITION 4.13.90
 @set VERSION 4.13.90

Index: tp/texi2any.pl
===================================================================
RCS file: /sources/texinfo/texinfo/tp/texi2any.pl,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- tp/texi2any.pl      16 Oct 2011 23:02:56 -0000      1.74
+++ tp/texi2any.pl      21 Oct 2011 18:42:36 -0000      1.75
@@ -481,15 +481,16 @@
 sub makeinfo_help()
 {
   my $makeinfo_help =
-    sprintf(__("Usage: %s [OPTION]... TEXINFO-FILE...\n"), $real_command_name)
+    __("Usage: makeinfo [OPTION]... TEXINFO-FILE...\n")
+  . __("  or:  texi2any [OPTION]... TEXINFO-FILE...\n")
 ."\n".
 __("Translate Texinfo source documentation to various other formats, by default
 Info files suitable for reading online with Emacs or standalone GNU Info.\n")
 ."\n";
   $makeinfo_help .= sprintf(__("General options:
-      --error-limit=NUM       quit after NUM errors (default %d).
       --document-language=STR locale to use in translating Texinfo keywords
                                 for the output document (default C).
+      --error-limit=NUM       quit after NUM errors (default %d).
       --force                 preserve output even if errors.
       --help                  display this help and exit.
       --no-validate           suppress node cross-reference validation.
@@ -596,7 +597,7 @@
   makeinfo foo.texi                      write Info to foo's address@hidden
   makeinfo --html foo.texi               write HTML to address@hidden
   makeinfo --xml foo.texi                write Texinfo XML to address@hidden
-  makeinfo --docbook foo.texi            write DocBook XML to address@hidden
+  makeinfo --docbook foo.texi            write Docbook XML to address@hidden
   makeinfo --no-headers foo.texi         write plain text to standard output
 
   makeinfo --html --no-headers foo.texi  write html without node lines, menus

Index: util/pdftexi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/pdftexi2dvi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- util/pdftexi2dvi    13 Apr 2009 00:29:38 -0000      1.4
+++ util/pdftexi2dvi    21 Oct 2011 18:42:36 -0000      1.5
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: pdftexi2dvi,v 1.4 2009/04/13 00:29:38 karl Exp $
+# $Id: pdftexi2dvi,v 1.5 2011/10/21 18:42:36 karl Exp $
 # Written by Thomas Esser.  Public domain.
 # Execute texi2dvi --pdf.
 
@@ -16,7 +16,7 @@
 # hack around a bug in zsh:
 test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
-rcs_revision='$Revision: 1.4 $'
+rcs_revision='$Revision: 1.5 $'
 rcs_version=`set - $rcs_revision; echo $2`
 
 # special-case --version following GNU standards for identifying the
@@ -25,9 +25,9 @@
 # obliged to.
 if test "x$1" = x--version; then
   cat <<EOF
-pdftexi2dvi (GNU Texinfo 4.13) $rcs_version
+texi2pdf (GNU Texinfo 4.13+dev) $rcs_version
 
-Copyright (C) 2009 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law.

Index: util/srclist.txt
===================================================================
RCS file: /sources/texinfo/texinfo/util/srclist.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- util/srclist.txt    17 Oct 2011 00:06:51 -0000      1.26
+++ util/srclist.txt    21 Oct 2011 18:42:36 -0000      1.27
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.26 2011/10/17 00:06:51 karl Exp $
+# $Id: srclist.txt,v 1.27 2011/10/21 18:42:36 karl Exp $
 # Files which we keep in sync from other places.
 # This is input for the script config/srclist-update in the gnulib
 # project on savannah.
@@ -36,6 +36,6 @@
 $GNULIBSRC/build-aux/mdate-sh          build-aux
 $GNULIBSRC/build-aux/missing           build-aux
 #
-$GNULIBSRC/doc/COPYING         .
+$GNULIBSRC/doc/COPYINGv3               ./COPYING
 $GNULIBSRC/doc/INSTALL         ./INSTALL.generic
 $GNULIBSRC/doc/fdl.texi                doc

Index: util/texi2dvi
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -b -r1.166 -r1.167
--- util/texi2dvi       27 Aug 2011 15:44:40 -0000      1.166
+++ util/texi2dvi       21 Oct 2011 18:42:37 -0000      1.167
@@ -1,6 +1,6 @@
 #! /bin/sh
 # texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.166 2011/08/27 15:44:40 karl Exp $
+# $Id: texi2dvi,v 1.167 2011/10/21 18:42:37 karl Exp $
 #
 # Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
 # 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
@@ -33,7 +33,7 @@
 set -e
 
 # This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.166 $'
+rcs_revision='$Revision: 1.167 $'
 rcs_version=`set - $rcs_revision; echo $2`
 program=`echo $0 | sed -e 's!.*/!!'`
 
@@ -298,8 +298,8 @@
   # where % denotes the eol character.
   cat <<EOF
 Usage: $program [OPTION]... FILE...
-       texi2pdf [OPTION]... FILE...
-       pdftexi2dvi [OPTION]... FILE...
+  or:  texi2pdf [OPTION]... FILE...
+  or:  pdftexi2dvi [OPTION]... FILE...
 
 Run each Texinfo or (La)TeX FILE through TeX in turn until all
 cross-references are resolved, building all indices.  The directory
@@ -388,7 +388,7 @@
 
 On the other hand, because \`tidy' compilation takes place in another
 directory, occasionally TeX won't be able to find some files (e.g., when
-using \\graphicspath): in that case use -I to specify the additional
+using \\graphicspath): in that case, use -I to specify the additional
 directories to consider.
 
 The values of the BIBTEX, DVIPDF, DVIPS, HEVEA, LATEX, MAKEINDEX,

Index: man/.cvsignore
===================================================================
RCS file: man/.cvsignore
diff -N man/.cvsignore
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/.cvsignore      21 Oct 2011 18:42:35 -0000      1.1
@@ -0,0 +1,8 @@
+Makefile
+Makefile.in
+info.1
+infokey.1
+install-info.1
+makeinfo.1
+texi2dvi.1
+texindex.1

Index: man/Makefile.am
===================================================================
RCS file: man/Makefile.am
diff -N man/Makefile.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/Makefile.am     21 Oct 2011 18:42:35 -0000      1.1
@@ -0,0 +1,90 @@
+# $Id: Makefile.am,v 1.1 2011/10/21 18:42:35 karl Exp $
+# Makefile.am for texinfo/man.
+#
+# 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
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# These are generated using help2man.
+man_MANS = info.1 infokey.1 install-info.1 makeinfo.1 texindex.1 texi2dvi.1
+
+# These are hand-written.
+man_MANS += info.5 texinfo.5
+
+# These are just .so's to the common program.
+man_MANS += texi2any.1 texi2pdf.1 pdftexi2dvi.1
+
+# Maintainers should be able to regenerate.
+MAINTAINERCLEANFILES = $(man_MANS)
+
+# 
+# Use the programs built in our distribution, taking account of possible
+# cross-compiling.  makeinfo needs a bunch of our included modules.
+tpdir = $(top_srcdir)/tp
+MAKEINFO = $(PERL) -I "$(tpdir)" "$(tpdir)"/texi2any.pl
+#
+tplibdir = $(tpdir)/maintain/lib
+mi_perl5lib = 
"$(tpdir):$(tplibdir)/libintl-perl/lib:$(tplibdir)/Unicode-EastAsianWidth/lib:$(tplibdir)/Text-Unidecode/lib"
+
+# Set up the variables:
+man_rule_0 = \
+  program=`expr '/$@' : '.*/\(.*\)\.1'` \
+  && case $$program in \
+         makeinfo) dir=tp; PERL5LIB=$(mi_perl5lib); export PERL5LIB;; \
+            info*) dir=info; program=g$$program;; \
+    *install-info) dir=install-info; program=g$$program;; \
+                *) dir=util;; esac \
+  && dir="$(top_builddir)/$(native_tools)/$$dir" \
+  && h2m="$(srcdir)/$$program.h2m"
+
+# Update the man page for a binary program; set up the variables,
+# make sure the binary is up-to-date and then generate the man page.
+man_rule_bin = echo "Updating man page $@" \
+  && $(man_rule_0) \
+  && echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) \
+  &&     (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) \
+  && echo $(HELP2MAN) --name=\""$$name"\" -I "$$h2m" "$$dir/$$program" -o '$@'\
+  &&      $(HELP2MAN) --name="$$name"     -I "$$h2m" "$$dir/$$program" -o '$@'
+
+
+# Using help2man depends on the package version number.
+common_mandeps = $(top_srcdir)/configure.ac
+
+# for Info, we have an additional help2man file since the standard
+# SEE ALSO text from help2man does not fit.
+$(srcdir)/info.1: $(top_srcdir)/info/info.c $(srcdir)/ginfo.h2m \
+                  $(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)/install-info/install-info.c \
+                          $(common_mandeps)
+       @name="update info/dir entries" && $(man_rule_bin)
+
+$(srcdir)/texindex.1: $(top_srcdir)/util/texindex.c $(common_mandeps)
+       @name="sort Texinfo index files" && $(man_rule_bin)
+
+# Here we need some postprocessing to avoid man misformatting.
+$(srcdir)/makeinfo.1: $(tpdir)/texi2any.pl $(common_mandeps)
+       @name="translate Texinfo documents" && $(man_rule_bin)
+       mv $@ address@hidden
+       sed '/^\.IP$$/N;/\nAlso/s/I//;/\nThe/s/I//' address@hidden >$@
+       rm address@hidden
+
+
+# For texi2dvi, do not depend on the current user's settings.
+texi2dvi_envvars = unset TEXI2DVI_BUILD_MODE; unset TEXI2DVI_BUILD_DIRECTORY
+
+$(srcdir)/texi2dvi.1: $(top_srcdir)/util/texi2dvi $(common_mandeps)
+       $(texi2dvi_envvars); $(HELP2MAN) \
+         --name="convert Texinfo documents to DVI or PDF" \
+         $(top_srcdir)/util/texi2dvi >$@

Index: man/ginfo.h2m
===================================================================
RCS file: man/ginfo.h2m
diff -N man/ginfo.h2m
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/ginfo.h2m       21 Oct 2011 18:42:36 -0000      1.1
@@ -0,0 +1,19 @@
+# $Id: ginfo.h2m,v 1.1 2011/10/21 18:42:36 karl Exp $
+# Additional section for the info man page.
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+[SEE ALSO]
+The full documentation for
+.B info
+is maintained as a Texinfo manual.  If the
+.B info
+program is properly installed at your site, the command
+.IP
+.B info info
+.PP
+should give you access to the complete manual.
+(Or, if you have Emacs, M-x info will lead to the manual.)

Index: man/info.5
===================================================================
RCS file: man/info.5
diff -N man/info.5
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/info.5  21 Oct 2011 18:42:36 -0000      1.1
@@ -0,0 +1,60 @@
+.\" info(5)
+.\" $Id: info.5,v 1.1 2011/10/21 18:42:36 karl Exp $
+.\"
+.\" Copyright 1998, 2005, 2011 Free Software Foundation, Inc.
+.\"
+.\" Copying and distribution of this file, with or without modification,
+.\" are permitted in any medium without royalty provided the copyright
+.\" notice and this notice are preserved.
+.\"
+.de EX
+.nf
+.ft CW
+.in +5
+..
+.de EE
+.in -5
+.ft R
+.fi
+..
+.TH INFO 5 "GNU Info" "FSF"
+.SH NAME
+info \- readable online documentation
+.SH DESCRIPTION
+The Info file format is an easily-parsable representation for online
+documents.  It can be read by
+.I emacs(1)
+and
+.I info(1)
+among other programs.
+.PP
+Info files are usually created from
+.I texinfo(5)
+sources by
+.IR makeinfo(1) ,
+but can be created from scratch if so desired.
+.PP
+For a full description of the Texinfo language and associated tools,
+please see the Texinfo manual (written in Texinfo itself).  Most likely,
+running this command from your shell:
+.EX
+info texinfo
+.EE
+or this key sequence from inside Emacs:
+.EX
+M-x info RET m texinfo RET
+.EE
+will get you there.
+.SH AVAILABILITY
+http://www.gnu.org/software/texinfo/
+.SH "REPORTING BUGS"
+Please send bug reports to address@hidden,
+general questions and discussion to address@hidden
+.SH "SEE ALSO"
+info(1), install-info(1), makeinfo(1), texi2dvi(1),
+.br
+texindex(1).
+.br
+emacs(1), tex(1).
+.br
+texinfo(5).

Index: man/pdftexi2dvi.1
===================================================================
RCS file: man/pdftexi2dvi.1
diff -N man/pdftexi2dvi.1
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/pdftexi2dvi.1   21 Oct 2011 18:42:36 -0000      1.1
@@ -0,0 +1 @@
+.so man1/texi2dvi.1

Index: man/texi2any.1
===================================================================
RCS file: man/texi2any.1
diff -N man/texi2any.1
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/texi2any.1      21 Oct 2011 18:42:36 -0000      1.1
@@ -0,0 +1 @@
+.so man1/makeinfo.1

Index: man/texi2pdf.1
===================================================================
RCS file: man/texi2pdf.1
diff -N man/texi2pdf.1
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/texi2pdf.1      21 Oct 2011 18:42:36 -0000      1.1
@@ -0,0 +1 @@
+.so man1/texi2dvi.1

Index: man/texinfo.5
===================================================================
RCS file: man/texinfo.5
diff -N man/texinfo.5
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ man/texinfo.5       21 Oct 2011 18:42:36 -0000      1.1
@@ -0,0 +1,51 @@
+.\" texinfo(5)
+.\" $Id: texinfo.5,v 1.1 2011/10/21 18:42:36 karl Exp $
+.\"
+.\" Copyright 1998, 1999, 2002, 2005, 2011 Free Software Foundation, Inc.
+.\"
+.\" Copying and distribution of this file, with or without modification,
+.\" are permitted in any medium without royalty provided the copyright
+.\" notice and this notice are preserved.
+.\"
+.de EX
+.nf
+.ft CW
+.in +5
+..
+.de EE
+.in -5
+.ft R
+.fi
+..
+.TH TEXINFO 5 "GNU Texinfo" "FSF"
+.SH NAME
+texinfo \- software documentation system
+.SH DESCRIPTION
+Texinfo is a documentation system that uses a single source file to
+produce both online information and printed output.  It is primarily
+designed for writing software manuals.
+.PP
+For a full description of the Texinfo language and associated tools,
+please see the Texinfo manual (written in Texinfo itself).  Most likely,
+running this command from your shell:
+.EX
+info texinfo
+.EE
+or this key sequence from inside Emacs:
+.EX
+M-x info RET m texinfo RET
+.EE
+will get you there.
+.SH AVAILABILITY
+http://www.gnu.org/software/texinfo/
+.br
+or any GNU mirror site.
+.SH "REPORTING BUGS"
+Please send bug reports to address@hidden,
+general questions and discussion to address@hidden
+.SH "SEE ALSO"
+info(1), install-info(1), makeinfo(1), texi2dvi(1), texindex(1).
+.br
+emacs(1), tex(1).
+.br
+info(5).

Index: doc/info.5
===================================================================
RCS file: doc/info.5
diff -N doc/info.5
--- doc/info.5  20 Jan 2005 22:38:32 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,72 +0,0 @@
-.\" info(5)
-.\" $Id: info.5,v 1.3 2005/01/20 22:38:32 karl Exp $
-.\"
-.\" Copyright (C) 1998 Free Software Foundation, Inc.
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of
-.\" this manual under the conditions for verbatim copying, provided that
-.\" the entire resulting derived work is distributed under the terms of a
-.\" permission notice identical to this one.
-.\"
-.\" Permission is granted to copy and distribute translations of this
-.\" manual into another language, under the above conditions for modified
-.\" versions, except that this permission notice may be stated in a
-.\" translation approved by the Foundation.
-.\"
-.de EX
-.nf
-.ft CW
-.in +5
-..
-.de EE
-.in -5
-.ft R
-.fi
-..
-.TH INFO 5 "GNU Info" "FSF"
-.SH NAME
-info \- readable online documentation
-.SH DESCRIPTION
-The Info file format is an easily-parsable representation for online
-documents.  It can be read by
-.I emacs(1)
-and
-.I info(1)
-among other programs.
-.PP
-Info files are usually created from
-.I texinfo(5)
-sources by
-.IR makeinfo(1) ,
-but can be created from scratch if so desired.
-.PP
-For a full description of the Texinfo language and associated tools,
-please see the Texinfo manual (written in Texinfo itself).  Most likely,
-running this command from your shell:
-.EX
-info texinfo
-.EE
-or this key sequence from inside Emacs:
-.EX
-M-x info RET m texinfo RET
-.EE
-will get you there.
-.SH AVAILABILITY
-ftp://ftp.gnu.org/pub/gnu/texinfo-<version>.tar.gz
-.br
-or any GNU mirror site.
-.SH "REPORTING BUGS"
-Please send bug reports to address@hidden,
-general questions and discussion to address@hidden
-.SH "SEE ALSO"
-info(1), install-info(1), makeinfo(1), texi2dvi(1),
-.br
-texindex(1).
-.br
-emacs(1), tex(1).
-.br
-texinfo(5).

Index: doc/texinfo.5
===================================================================
RCS file: doc/texinfo.5
diff -N doc/texinfo.5
--- doc/texinfo.5       20 Jan 2005 22:38:32 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,61 +0,0 @@
-.\" texinfo(5)
-.\" $Id: texinfo.5,v 1.3 2005/01/20 22:38:32 karl Exp $
-.\"
-.\" Copyright (C) 1998, 1999, 2002 Free Software Foundation, Inc.
-.\"
-.\" Permission is granted to make and distribute verbatim copies of this
-.\" manual provided the copyright notice and this permission notice are
-.\" preserved on all copies.
-.\"
-.\" Permission is granted to copy and distribute modified versions of
-.\" this manual under the conditions for verbatim copying, provided that
-.\" the entire resulting derived work is distributed under the terms of a
-.\" permission notice identical to this one.
-.\"
-.\" Permission is granted to copy and distribute translations of this
-.\" manual into another language, under the above conditions for modified
-.\" versions, except that this permission notice may be stated in a
-.\" translation approved by the Foundation.
-.\"
-.de EX
-.nf
-.ft CW
-.in +5
-..
-.de EE
-.in -5
-.ft R
-.fi
-..
-.TH TEXINFO 5 "GNU Texinfo" "FSF"
-.SH NAME
-texinfo \- software documentation system
-.SH DESCRIPTION
-Texinfo is a documentation system that uses a single source file to
-produce both online information and printed output.  It is primarily
-designed for writing software manuals.
-.PP
-For a full description of the Texinfo language and associated tools,
-please see the Texinfo manual (written in Texinfo itself).  Most likely,
-running this command from your shell:
-.EX
-info texinfo
-.EE
-or this key sequence from inside Emacs:
-.EX
-M-x info RET m texinfo RET
-.EE
-will get you there.
-.SH AVAILABILITY
-ftp://ftp.gnu.org/gnu/texinfo/
-.br
-or any GNU mirror site.
-.SH "REPORTING BUGS"
-Please send bug reports to address@hidden,
-general questions and discussion to address@hidden
-.SH "SEE ALSO"
-info(1), install-info(1), makeinfo(1), texi2dvi(1), texindex(1).
-.br
-emacs(1), tex(1).
-.br
-info(5).

Index: info/ginfo.h2m
===================================================================
RCS file: info/ginfo.h2m
diff -N info/ginfo.h2m
--- info/ginfo.h2m      22 Feb 2011 19:18:14 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-# $Id: ginfo.h2m,v 1.1 2011/02/22 19:18:14 karl Exp $
-# Additional section for the info man page.
-# Copyright 2011 Free Software Foundation, Inc.
-#
-# Copying and distribution of this file, with or without modification,
-# are permitted in any medium without royalty provided the copyright
-# notice and this notice are preserved.
-
-[SEE ALSO]
-The full documentation for
-.B info
-is maintained as a Texinfo manual.  If the
-.B info
-program is properly installed at your site, the command
-.IP
-.B info info
-.PP
-should give you access to the complete manual.
-(Or, if you have Emacs, M-x info will lead to the manual.)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]