texinfo ChangeLog doc/Makefile.am info/ginfo.h2m

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       11/02/22 19:18:14

Modified files:
        .              : ChangeLog 
        doc            : Makefile.am 
Added files:
        info           : ginfo.h2m 

Log message:
        add SEE ALSO section to info.1

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1216&r2=1.1217
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/Makefile.am?cvsroot=texinfo&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/ginfo.h2m?cvsroot=texinfo&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1216
retrieving revision 1.1217
diff -u -b -r1.1216 -r1.1217
--- ChangeLog   20 Feb 2011 18:39:39 -0000      1.1216
+++ ChangeLog   22 Feb 2011 19:18:13 -0000      1.1217
@@ -1,3 +1,11 @@
+2011-02-22  Karl Berry  <address@hidden>
+
+       * info/ginfo.h2m: new file.
+       * doc/Makefile.am (info.1): also depend on info/ginfo.h2m.
+       (man_rule_info): use -I to have help2man optionally include
+       $$program.h2m.
+       https://savannah.gnu.org/bugs/?24052
+
 2011-02-20  Karl Berry  <address@hidden>
 
        * doc/refcard/txirefcard.tex,

Index: doc/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/doc/Makefile.am,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- doc/Makefile.am     24 Jun 2010 00:17:01 -0000      1.42
+++ doc/Makefile.am     22 Feb 2011 19:18:14 -0000      1.43
@@ -1,7 +1,7 @@
-# $Id: Makefile.am,v 1.42 2010/06/24 00:17:01 karl Exp $
+# $Id: Makefile.am,v 1.43 2011/02/22 19:18:14 karl Exp $
 # Makefile.am for texinfo/doc.
 #
-# Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+# 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
@@ -67,7 +67,9 @@
        for f in $(TXI_XLATE); do \
          $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(texmf_texinfo)/$$f; done
 
-# The man pages depend on the --help strings and the version number.
+# 
+# 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:
@@ -85,17 +87,23 @@
        $(man_rule_0) && \
        echo cd "$$dir" '&&' $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT) && \
            (cd "$$dir"  &&  $(MAKE) $(AM_MAKEFLAGS) $$program$(EXEEXT)) && \
-       echo $(HELP2MAN) --name=\""$$name"\" "$$dir/$$program" -o '$@' && \
-            $(HELP2MAN) --name="$$name"     "$$dir/$$program" -o '$@'
+       echo $(HELP2MAN) --name=\""$$name"\" -I "$$dir/$$program.h2m" 
"$$dir/$$program" -o '$@' && \
+            $(HELP2MAN) --name="$$name"     -I "$$dir/$$program.h2m" 
"$$dir/$$program" -o '$@'
 
-$(srcdir)/info.1: $(top_srcdir)/info/info.c $(common_mandeps)
+# 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)
+
+$(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:
+# Here we need some postprocessing to avoid man misformatting.
 $(srcdir)/makeinfo.1: $(top_srcdir)/makeinfo/makeinfo.c $(common_mandeps)
        @name="translate Texinfo documents" && $(man_rule_bin)
        mv $@ address@hidden
@@ -106,9 +114,8 @@
        @name="sort Texinfo index files" && $(man_rule_bin)
 
 
-## ---------- ##
-## texi2dvi.  ##
-## ---------- ##
+# 
+# texi2dvi in all its forms.
 
 man_MANS += texi2dvi.1 texi2pdf.1 pdftexi2dvi.1
 util_srcdir = $(top_srcdir)/util

Index: info/ginfo.h2m
===================================================================
RCS file: info/ginfo.h2m
diff -N info/ginfo.h2m
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ info/ginfo.h2m      22 Feb 2011 19:18:14 -0000      1.1
@@ -0,0 +1,19 @@
+# $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.)