Re: [PATCH 22/22] maint: avoid distcheck failure by properly cleaning $(EXTRA_MANS)

[Jim Meyering]

Stefano Lattarini wrote:

> From: Jim Meyering <address@hidden>
>
> * man/local.mk (distclean-local): Remove $(ALL_MANS) when doing
> a VPATH build.  If it's not done, generated manpages can be left
> around in the build directory after a "make distclean", causing
> failures in "make distcheck".
> ---
>  man/local.mk | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/man/local.mk b/man/local.mk
> index 8904eb5..da7de24 100644
> --- a/man/local.mk
> +++ b/man/local.mk
> @@ -35,6 +35,11 @@ MAINTAINERCLEANFILES += $(ALL_MANS)
>  # the manpages must be generated before the distdir is created and filled.
>  $(EXTRA_MANS): $(all_programs)
>
> +# This is a kludge to remove generated 'man/*.1' from a non-srcdir build.
> +# Without this, "make distcheck" might fail.
> +distclean-local:
> +     test $(srcdir) = x$(builddir) || rm -f $(ALL_MANS)

Using your new ALL_MANS variable is fine here, but when you
modified my patch, you removed the "x" on the first term of that test.
And that caused a hard-to-diagnose "make distcheck" failure.

This is obviously what you intended:
(and what I've merged into that commit, locally)

diff --git a/man/local.mk b/man/local.mk
index 8c1ec60..98cc4fd 100644
--- a/man/local.mk
+++ b/man/local.mk
@@ -38,7 +38,7 @@ $(EXTRA_MANS): $(all_programs)
 # This is a kludge to remove generated 'man/*.1' from a non-srcdir build.
 # Without this, "make distcheck" might fail.
 distclean-local:
-       test $(srcdir) = x$(builddir) || rm -f $(ALL_MANS)
+       test x$(srcdir) = x$(builddir) || rm -f $(ALL_MANS)

 # Dependencies common to all man pages.  Updated below.
 mandeps =

With this (final?) change, I expect "make distcheck" to succeed
using my current set of patches.