Files
coreutils/man/help2man.diff
T
Bernhard Voelker 321933e14f maint: use help2man configured with --disable-nls
Prompted by the continuous integration build failure at:
http://hydra.nixos.org/build/6038769

The previously committed 'help2man' requires a Perl module
which does not seem to be installed everywhere - and which
is not needed for our purposes:

  Can't locate Locale/gettext.pm in @INC
  BEGIN failed--compilation aborted at ./man/help2man line 28.

This module was pulled in automatically by the default configure call.
Use the NLS-disabled version instead.

* man/help2man.in: Use help2man configured with the --disable-nls
option to avoid the dependency to the above Perl module.
* man/help2man.diff: Adapt the line numbers of the hunks in the
coreutils-specific patch for help2man to apply without fuzz.

Reported by Pádraig Brady.
2013-09-12 07:41:28 +02:00

33 lines
812 B
Diff

--- 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