forked from pool/coreutils
67 lines
2.4 KiB
Diff
67 lines
2.4 KiB
Diff
|
Upstream patch on top of v8.23, i.e. to be removed with v8.24:
|
||
|
|
Fixes https://bugzilla.opensuse.org/show_bug.cgi?id=933396
|
||
|
|
|
||
|
|
Upstream patch:
|
||
|
|
http://git.sv.gnu.org/cgit/coreutils.git/commit/?id=e4627416b4be
|
||
|
|
|
||
|
|
From e4627416b4be078a184372b9b0582517612a3c39 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
||
|
|
Date: Tue, 9 Sep 2014 02:05:45 +0100
|
||
|
|
Subject: [PATCH] doc: adjust reference to info nodes in man pages
|
||
|
|
|
||
|
|
old form: coreutils '$cmd invocation'
|
||
|
|
new form: '(coreutils) $cmd invocation'
|
||
|
|
|
||
|
|
The old form erroneously referenced the node for the 'coreutils'
|
||
|
|
multi-call program. Now that problematic node name was renamed
|
||
|
|
in commit v8.23-18-g72e470b, but the newer less ambiguous form
|
||
|
|
also has the advantage of working with the pinfo viewer for example.
|
||
|
|
Full discussion at http://bugs.gnu.org/18428
|
||
|
|
|
||
|
|
* man/local.mk: Adjust man page references to texinfo nodes.
|
||
|
|
* src/system.h: Adjust --help references to texinfo nodes.
|
||
|
|
---
|
||
|
|
man/dummy-man | 2 +-
|
||
|
|
man/local.mk | 2 +-
|
||
|
|
src/system.h | 3 ++-
|
||
|
|
3 files changed, 4 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
Index: man/dummy-man
|
||
|
|
===================================================================
|
||
|
|
--- man/dummy-man.orig
|
||
|
|
+++ man/dummy-man
|
||
|
|
@@ -69,5 +69,5 @@ The full documentation for
|
||
|
|
is maintained as a Texinfo manual, which should be accessible
|
||
|
|
on your system via the command
|
||
|
|
.IP
|
||
|
|
-.B info coreutils $bs(aq$progname invocation$bs(aq
|
||
|
|
+.B info $bs(aq(coreutils) $progname invocation$bs(aq
|
||
|
|
END
|
||
|
|
Index: man/local.mk
|
||
|
|
===================================================================
|
||
|
|
--- man/local.mk.orig
|
||
|
|
+++ man/local.mk
|
||
|
|
@@ -102,7 +102,7 @@ man/dynamic-deps.mk: Makefile
|
||
|
|
--source='$(PACKAGE_STRING)' \
|
||
|
|
--include=$(srcdir)/man/$$name.x \
|
||
|
|
--output=$$t/$$name.1 $$t/$$argv \
|
||
|
|
- --info-page='coreutils \(aq'$$name' invocation\(aq' \
|
||
|
|
+ --info-page='\(aq(coreutils) '$$name' invocation\(aq' \
|
||
|
|
&& sed \
|
||
|
|
-e 's|$*\.td/||g' \
|
||
|
|
-e '/For complete documentation/d' \
|
||
|
|
Index: src/system.h
|
||
|
|
===================================================================
|
||
|
|
--- src/system.h.orig
|
||
|
|
+++ src/system.h
|
||
|
|
@@ -582,7 +582,8 @@ emit_ancillary_info (void)
|
||
|
|
last_component (program_name));
|
||
|
|
}
|
||
|
|
printf (_("For complete documentation, run: "
|
||
|
|
- "info coreutils '%s invocation'\n"), last_component (program_name));
|
||
|
|
+ "info '(coreutils) %s invocation'\n"),
|
||
|
|
+ last_component (program_name));
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline void
|