summaryrefslogtreecommitdiff
path: root/cfg.mk
diff options
context:
space:
mode:
authorBernhard Voelker <mail@bernhard-voelker.de>2013-08-02 08:28:50 +0200
committerBernhard Voelker <mail@bernhard-voelker.de>2013-09-09 22:52:18 +0200
commit54a155a37ea2736671bbbf5bf45446425314a77a (patch)
treeaa70828752ab7f4cc730fc3aee0b6f80f2d53a41 /cfg.mk
parentb86437e1262f5e171db2d7372a4e13cd621ab706 (diff)
downloadcoreutils-54a155a37ea2736671bbbf5bf45446425314a77a.tar.xz
maint: update help2man to 1.43.3
Instead of diverging further from the upstream GNU help2man project (http://www.gnu.org/software/help2man/), hold a copy of the original script and keep track of our changes in a separate patch file. The man pages created with the new version show the following, non-invasive differences: a) command options in the EXAMPLE sections are no longer in bold format, b) file names are underlined now consistently. * man/help2man: Rename to ... * man/help2man.in: ... this file, and update content from the upstream GNU help2man project. * man/help2man.diff: Add patch file for help2man to remove the sentence "For complete documentation ..." (see commit 5d4f09d8), and to emit "info coreutils 'PROG invocation'" into the man pages (77abf69a). * man/local.mk (mandeps): Add help2man to the dependencies of the man pages. (man/help2man): Add rule to generate this script from the upstream help2man.in file and the help2man.diff patch. * .gitignore: Add man/help2man as it is no longer version controlled. * cfg.mk (sc_long_lines): Exempt help2man.in from this check. (sc_po_check): Likewise. (sc_space_tab): Likewise. (sc_trailing_blank): Exempt man/help2man.diff from this check. (sc_prohibit_tab_based_indentation): Instead of help2man, now exempt both help2man.in and help2man.diff from this test. * .x-update-copyright: Add new file and add the above new help2man files as well as the COPYING file.
Diffstat (limited to 'cfg.mk')
-rw-r--r--cfg.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/cfg.mk b/cfg.mk
index a4f36ff5f..61bda4bcc 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -221,11 +221,13 @@ sc_prohibit-gl-attributes:
# Look for lines longer than 80 characters, except omit:
# - program-generated long lines in diff headers,
+# - the original help2man script copied from upstream,
# - tests involving long checksum lines, and
# - the 'pr' test cases.
LINE_LEN_MAX = 80
FILTER_LONG_LINES = \
/^[^:]*\.diff:[^:]*:@@ / d; \
+ \|^[^:]*man/help2man\.in:| d; \
\|^[^:]*tests/misc/sha[0-9]*sum.*\.pl[-:]| d; \
\|^[^:]*tests/pr/|{ \|^[^:]*tests/pr/pr-tests:| !d; };
sc_long_lines:
@@ -566,10 +568,10 @@ update-copyright-env = \
# List syntax-check exemptions.
exclude_file_name_regexp--sc_space_tab = \
- ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$)
+ ^(tests/pr/|tests/misc/nl\.sh$$|gl/.*\.diff$$|man/help2man\.diff$$)
exclude_file_name_regexp--sc_bindtextdomain = \
^(gl/.*|lib/euidaccess-stat|src/make-prime-list)\.c$$
-exclude_file_name_regexp--sc_trailing_blank = ^tests/pr/
+exclude_file_name_regexp--sc_trailing_blank = ^(tests/pr/|man/help2man.diff)
exclude_file_name_regexp--sc_system_h_headers = \
^src/((system|copy)\.h|libstdbuf\.c|make-prime-list\.c)$$
@@ -579,7 +581,7 @@ exclude_file_name_regexp--sc_require_config_h_first = \
exclude_file_name_regexp--sc_require_config_h = \
$(exclude_file_name_regexp--sc_require_config_h_first)
-exclude_file_name_regexp--sc_po_check = ^gl/
+exclude_file_name_regexp--sc_po_check = ^(gl/|man/help2man\.in)
exclude_file_name_regexp--sc_prohibit_always-defined_macros = \
^src/(seq|remove)\.c$$
exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^tests/pr/
@@ -599,7 +601,7 @@ exclude_file_name_regexp--sc_useless_cpp_parens = $(_ll)
exclude_file_name_regexp--sc_long_lines = $(_ll)
exclude_file_name_regexp--sc_space_before_open_paren = $(_ll)
-tbi_1 = ^tests/pr/|(^gl/lib/reg.*\.c\.diff|\.mk|^man/help2man)$$
+tbi_1 = ^tests/pr/|(^gl/lib/reg.*\.c\.diff|\.mk|^man/help2man\.(in|diff))$$
tbi_2 = ^scripts/git-hooks/(pre-commit|pre-applypatch|applypatch-msg)$$
tbi_3 = (GNU)?[Mm]akefile(\.am)?$$|$(_ll)
exclude_file_name_regexp--sc_prohibit_tab_based_indentation = \