gnu/help2man

diff --git a/ChangeLog b/ChangeLog
index 22a905e..7e19e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Sat Sep  7 02:13:05 2002  Brendan O'Dea  <bod@debian.org>
+
+	* help2man.texi: Change @dircategory to "GNU programming support"
+	  (Karl Berry). Change @setchapternewpage to "on" (Peter Moulder).
+
+	* Makefile.in: Added some more GNU standard targets (Peter
+	  Moulder).
+
+	* Makefile.in, help2man.h2m: Rename help2man.aux to .h2m to avoid
+	  clashing with tex.
+
+	* help2man.PL: version bump
+
 Tue Jun  4 00:53:18 2002  Brendan O'Dea  <bod@odea.dropbear.id.au>
 
 	* help2man.PL: Expand copyright years (Paul Eggert).  Provide
diff --git a/Makefile.in b/Makefile.in
index 1912530..5e2b872 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for help2man
-# $Id: Makefile.in,v 1.3 2000/04/15 14:17:40 bod Exp $
+# $Id: Makefile.in,v 1.5 2002/09/06 16:13:05 bod Exp $
 
 SHELL = @SHELL@
 
@@ -26,6 +26,10 @@ PERL = @PERL@
 target = help2man
 
 all: $(target)
+
+install-strip: install
+# No binaries to strip.
+
 install: $(target) $(target)$(manext) $(target).info
 	$(MKINSTALLDIRS) $(DESTDIR)$(bindir)
 	$(INSTALL_PROGRAM) $(target) $(DESTDIR)$(bindir)/$(target)
@@ -40,25 +44,53 @@ install: $(target) $(target)$(manext) $(target).info
 	    $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) $(target).info; \
 	fi
 
+uninstall:
+	rm -f $(DESTDIR)$(bindir)/$(target) \
+	    $(DESTDIR)$(man1dir)/$(target)$(manext) \
+	    $(DESTDIR)$(infodir)/$(target).info
+
+	if test -f $(DESTDIR)$(infodir)/dir; \
+	then \
+	    $(INSTALL_INFO) --delete --info-dir=$(DESTDIR)$(infodir) \
+		$(target).info; \
+	fi
+
+
 check: $(target)$(manext)
-clean mostlyclean:
-realclean:
+
+clean mostlyclean realclean:
 	-rm -f $(target) $(target)$(manext)
+	rm -f $(target).dvi $(target).aux $(target).cp $(target).cps \
+	    $(target).fn $(target).ky $(target).log $(target).pg \
+	    $(target).toc $(target).tp $(target).vr
 
 distclean: realclean
 	-rm -f config.cache config.log config.status Makefile 
 
+maintainer-clean: distclean
+	rm -f help2man.info
+
 $(target): $(srcdir)/$(target).PL
 	-rm -f $@
-	$(PERL) $(srcdir)/$(target).PL --stdout >$@
+	$(PERL) $? --stdout >$@
 	chmod 555 $@
 
-$(target)$(manext): $(target) $(srcdir)/$(target).aux
-	./$(target) --include=$(srcdir)/$(target).aux \
-	    --output=$(target)$(manext) ./$(target)
+$(target)$(manext): $(target) $(srcdir)/$(target).h2m
+	./$(target) --include=$(srcdir)/$(target).h2m \
+	    --output=$@ ./$(target)
 
+info: $(target).info
 $(target).info: $(srcdir)/$(target).texi
 	$(MAKEINFO) $? -o $@
 
+dvi: $(target).dvi
+$(target).dvi: $(srcdir)/$(target).texi
+	$(TEXI2DVI) $?
+
 Makefile: $(srcdir)/Makefile.in
 	./config.status
+
+.PHONY: all check clean distclean dvi info install mostlyclean \
+    realclean uninstall
+
+.SUFFIXES:
diff --git a/NEWS b/NEWS
index b19ba13..005d4d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Version 1.29		September 7, 2002
+
+ * Change info category to "GNU programming support".
+
+Version 1.28		June 4, 2002
+
+ * Add --info-page option.
+
 Version 1.27		March 19, 2002
 
  * Allow short and long options to be separated by multiple spaces
diff --git a/README b/README
index 67147be..f977f66 100644
--- a/README
+++ b/README
@@ -1,15 +1,15 @@
                         README for GNU help2man
 
-                             version 1.28
+                             version 1.29
 
-                             June  4, 2002
+                          September  7, 2002
 
 
 help2man is a script to create simple man pages from the --help and
 --version output of programs.
 
   http://www.gnu.org/software/help2man/
-  ftp://ftp.gnu.org/gnu/help2man/help2man-1.28.tar.gz
+  ftp://ftp.gnu.org/gnu/help2man/help2man-1.29.tar.gz
 
 Since most GNU documentation is now in info format, this provides a
 way to generate a placeholder man page pointing to that resource while
diff --git a/THANKS b/THANKS
index c3fb846..64173f4 100644
--- a/THANKS
+++ b/THANKS
@@ -3,7 +3,7 @@ by reporting problems, suggesting various improvements or submitting
 actual code follows.
 
 Karl Berry			<karl@freefriends.org>
-Bonzini				<bonzini@gnu.org>
+Paolo Bonzini			<bonzini@gnu.org>
 Mo DeJong			<mdejong@cygnus.com>
 Akim Demaille			<demaille@inf.enst.fr>
 Paul Eggert			<eggert@twinsun.com>
diff --git a/help2man.PL b/help2man.PL
index 97aabc9..8f43747 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -16,7 +16,7 @@ use Config;
 use Getopt::Long;
 
 my ($program, $version)
-    = (qw$Id: help2man.PL,v 1.28 2002/06/03 14:44:49 bod Exp $)[1..2];
+    = (qw$Id: help2man.PL,v 1.29 2002/09/06 15:48:31 bod Exp $)[1..2];
 
 $program =~ s/\.PL(,v)?$//;
 
diff --git a/help2man.aux b/help2man.aux
deleted file mode 100644
index 6537105..0000000
--- a/help2man.aux
+++ /dev/null
@@ -1,71 +0,0 @@
-Include file for help2man man page
-
-$Id: help2man.aux,v 1.6 2000/12/22 12:17:00 bod Exp $
-
-[name]
-help2man \- generate a simple manual page
-
-[include files]
-Additional material may be included in the generated output with the
-.B \-\-include
-and
-.B \-\-opt\-include
-options.  The format is simple:
-
-    [section]
-    text
-
-    /pattern/
-    text
-
-Blocks of verbatim *roff text are inserted into the output either at
-the start of the given
-.BI [ section ]
-(case insensitive), or after a paragraph matching
-.BI / pattern /\fR.
-
-Patterns use the Perl regular expression syntax and may be followed by
-the
-.IR i ,
-.I s
-or
-.I m
-modifiers (see
-.BR perlre (1)).
-
-Lines before the first section or pattern which begin with `\-' are
-processed as options.  Anything else is silently ignored and may be
-used for comments, RCS keywords and the like.
-
-The section output order is:
-
-    NAME
-    SYNOPSIS
-    DESCRIPTION
-    OPTIONS
-    EXAMPLES
-    \fIother\fR
-    AUTHOR
-    REPORTING BUGS
-    COPYRIGHT
-    SEE ALSO
-
-Any
-.B [name]
-or
-.B [synopsis]
-sections appearing in the include file will replace what would have
-automatically been produced (although you can still override the
-former with
-.B --name
-if required).
-
-Other sections are prepended to the automatically produced output for
-the standard sections given above, or included at
-.I other
-(above) in the order they were encountered in the include file.
-
-[availability]
-The latest version of this distribution is available on-line from:
-
-    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.h2m b/help2man.h2m
new file mode 100644
index 0000000..256756a
--- /dev/null
+++ b/help2man.h2m
@@ -0,0 +1,71 @@
+Include file for help2man man page
+
+$Id: help2man.h2m,v 1.7 2002/09/06 16:09:13 bod Exp $
+
+[name]
+help2man \- generate a simple manual page
+
+[include files]
+Additional material may be included in the generated output with the
+.B \-\-include
+and
+.B \-\-opt\-include
+options.  The format is simple:
+
+    [section]
+    text
+
+    /pattern/
+    text
+
+Blocks of verbatim *roff text are inserted into the output either at
+the start of the given
+.BI [ section ]
+(case insensitive), or after a paragraph matching
+.BI / pattern /\fR.
+
+Patterns use the Perl regular expression syntax and may be followed by
+the
+.IR i ,
+.I s
+or
+.I m
+modifiers (see
+.BR perlre (1)).
+
+Lines before the first section or pattern which begin with `\-' are
+processed as options.  Anything else is silently ignored and may be
+used for comments, RCS keywords and the like.
+
+The section output order is:
+
+    NAME
+    SYNOPSIS
+    DESCRIPTION
+    OPTIONS
+    EXAMPLES
+    \fIother\fR
+    AUTHOR
+    REPORTING BUGS
+    COPYRIGHT
+    SEE ALSO
+
+Any
+.B [name]
+or
+.B [synopsis]
+sections appearing in the include file will replace what would have
+automatically been produced (although you can still override the
+former with
+.B --name
+if required).
+
+Other sections are prepended to the automatically produced output for
+the standard sections given above, or included at
+.I other
+(above) in the order they were encountered in the include file.
+
+[availability]
+The latest version of this distribution is available on-line from:
+
+    ftp://ftp.gnu.org/gnu/help2man/
diff --git a/help2man.info b/help2man.info
index ffae2b3..d65cd51 100644
--- a/help2man.info
+++ b/help2man.info
@@ -1,7 +1,7 @@
-This is help2man.info, produced by makeinfo version 4.1 from
+This is help2man.info, produced by makeinfo version 4.2 from
 help2man.texi.
 
-INFO-DIR-SECTION GNU admin
+INFO-DIR-SECTION GNU programming support
 START-INFO-DIR-ENTRY
 * help2man: (help2man).      Automatic manual page generation.
 END-INFO-DIR-ENTRY
@@ -314,13 +314,13 @@ Obtaining `help2man'
 
 
 Tag Table:
-Node: Top1086
-Node: Overview1719
-Node: Invoking help2man2425
-Node: --help recommendations4419
-Node: Including text7834
-Node: Makefile usage9375
-Node: Reports10301
-Node: Availability10576
+Node: Top1100
+Node: Overview1733
+Node: Invoking help2man2439
+Node: --help recommendations4433
+Node: Including text7848
+Node: Makefile usage9389
+Node: Reports10315
+Node: Availability10590
 
 End Tag Table
diff --git a/help2man.texi b/help2man.texi
index 01ffb37..c9ce9cf 100644
--- a/help2man.texi
+++ b/help2man.texi
@@ -1,11 +1,11 @@
 \input texinfo @c -*-texinfo-*-
 @setfilename help2man.info
 @settitle @command{help2man} Reference Manual
-@setchapternewpage odd
+@setchapternewpage on
 @finalout
-@c $Id: help2man.texi,v 1.7 2002/03/09 12:53:04 bod Exp $
+@c $Id: help2man.texi,v 1.8 2002/09/06 15:49:44 bod Exp $
 
-@dircategory GNU admin
+@dircategory GNU programming support
 @direntry
 * help2man: (help2man).      Automatic manual page generation.
 @end direntry
diff --git a/install-sh b/install-sh
index e9de238..c122ef9 100755
--- a/install-sh
+++ b/install-sh
@@ -163,7 +163,7 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
-defaultIFS='	
+defaultIFS=' 	
 '
 IFS="${IFS-${defaultIFS}}"