*** empty log message ***

[platform/upstream/coreutils.git] / Makefile.maint

diff --git a/Makefile.maint b/Makefile.maint
index 455f475..6d28393 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -262,8 +262,12 @@ sc_trailing_blank:
          { echo '$(ME): found trailing blank(s)'                       \
                1>&2; exit 1; } || :
 
+# Match lines like the following, but where there is only one space
+# between the options and the description:
+#   -D, --all-repeated[=delimit-method]  print all duplicate lines\n
+longopt_re = --[a-z][0-9A-Za-z-]*(\[=[0-9A-Za-z-]*\])?
 sc_two_space_separator_in_usage:
-       @grep -n '^   *--[a-z][0-9A-Za-z-]* [^ ].*\\$$'                 \
+       @grep -nE '^   *(-[A-Za-z],)? $(longopt_re) [^ ].*\\$$'         \
            $$($(CVS_LIST_EXCEPT)) &&                                   \
          { echo "$(ME): help2man requires at least two spaces between"; \
            echo "$(ME): an option and its description"; \
@@ -290,8 +294,11 @@ sc_useless_cpp_parens:
 # have to copy all of src/ before running patch.
 patch-check:
        cp src/remove.c tmp-remove.c
-       patch -V never --fuzz=0 tmp-remove.c src/c99-to-c89.diff
-       rm -f tmp-remove.c
+       patch -V never --fuzz=0 tmp-remove.c src/c99-to-c89.diff \
+         > $@.1 2>&1
+       sed -n '2p' $@.1 > $@.2
+       test -s $@.2 && exit 1 || :
+       rm -f tmp-remove.c $@.1 $@.2
 
 # Ensure that date's --help output stays in sync with the info
 # documentation for GNU strftime.  The only exception is %N,
@@ -425,7 +432,7 @@ cvs-diff-check:
 
 cvs-check: cvs-diff-check cvs-tag-check
 
-maintainer-distcheck: changelog-check
+maintainer-distcheck:
        $(MAKE) distcheck
        $(MAKE) my-distcheck
 
@@ -615,7 +622,7 @@ $(xd-delta): $(release_archive_dir)/$(prev-tgz) $(distdir).tar.gz
        xdelta delta -9 $^ $@ || :
 
 .PHONY: alpha beta major
-alpha beta major: news-date-check $(local-check)
+alpha beta major: news-date-check changelog-check $(local-check)
        test $@ = major                                         \
          && { echo $(VERSION) | grep -E '^[0-9]+(\.[0-9]+)+$$' \
               || { echo "invalid version string: $(VERSION)" 1>&2; exit 1; }}\