diff options
Diffstat (limited to 'man')
| -rwxr-xr-x | man/dummy-man | 1 | ||||
| -rwxr-xr-x | man/help2man (renamed from man/help2man.in) | 0 | ||||
| -rw-r--r-- | man/help2man.diff | 32 | ||||
| -rw-r--r-- | man/local.mk | 16 |
4 files changed, 6 insertions, 43 deletions
diff --git a/man/dummy-man b/man/dummy-man index 306937628..dca2b6784 100755 --- a/man/dummy-man +++ b/man/dummy-man @@ -30,6 +30,7 @@ while test $# -gt 0; do # in the makefile. --include=*);; --include) shift;; + --info-page=*);; -*) fatal_ "invalid or unrecognized help2man option '$1'";; --) shift; break;; *) break;; diff --git a/man/help2man.in b/man/help2man index bfeb98972..bfeb98972 100755 --- a/man/help2man.in +++ b/man/help2man diff --git a/man/help2man.diff b/man/help2man.diff deleted file mode 100644 index 12fa76f22..000000000 --- a/man/help2man.diff +++ /dev/null @@ -1,32 +0,0 @@ ---- man/help2man-orig -+++ man/help2man 2013-09-10 07:31:28.352365301 +0200 -@@ -412,6 +412,7 @@ - my $PAT_FILES = _('Files'); - my $PAT_EXAMPLES = _('Examples'); - my $PAT_FREE_SOFTWARE = _('This +is +free +software'); -+my $PAT_INFO = _('For +complete +documentation'); - - # Start a new paragraph (if required) for these. - s/([^\n])\n($PAT_BUGS|$PAT_AUTHOR) /$1\n\n$2 /og; -@@ -444,6 +445,12 @@ - next; - } - -+ # Skip any texinfo reference as that's handled separately -+ if (s/($PAT_INFO).*\n//o) -+ { -+ next; -+ } -+ - # Copyright section - if (/^Copyright /) - { -@@ -622,7 +629,7 @@ - .B %s - programs are properly installed at your site, the command - .IP --.B info %s -+.B info coreutils \(aq%s invocation\(aq - .PP - should give you access to the complete manual. - EOT diff --git a/man/local.mk b/man/local.mk index d967d1636..266b780f9 100644 --- a/man/local.mk +++ b/man/local.mk @@ -50,9 +50,6 @@ distclean-local: # Dependencies common to all man pages. Updated below. mandeps = -# Depend on the help2man script. -mandeps += man/help2man - # Depend on this to get version number changes. mandeps += .version @@ -62,13 +59,6 @@ mandeps += $(top_srcdir)/src/system.h $(ALL_MANS): $(mandeps) -# Create help2man from the upstream version and out patch. -man/help2man: man/help2man.in man/help2man.diff - $(AM_V_GEN)cp man/help2man.in man/help2man.tmp \ - && VERSION_CONTROL=none patch man/help2man.tmp < man/help2man.diff \ - && chmod a+x man/help2man.tmp \ - && mv man/help2man.tmp man/help2man - # Most prog.1 man pages depend on src/prog. List the exceptions: # Note that dir and vdir are exceptions only if you consider the name # of the .c file upon which they depend: ls.c. @@ -200,7 +190,11 @@ man/yes.1: src/yes --source='$(PACKAGE_STRING)' \ --include=$(srcdir)/man/$$name.x \ --output=$$t/$$name.1 $$t/$$name \ - && sed 's|$*\.td/||g' $$t/$$name.1 > $@-t \ + --info-page='coreutils \(aq'$$name' invocation\(aq' \ + && sed \ + -e 's|$*\.td/||g' \ + -e '/For complete documentation/d' \ + $$t/$$name.1 > $@-t \ && rm -rf $$t \ && chmod a-w $@-t \ && mv $@-t $@ |