[COMMITTED] automake: Add std-options to check --version and --help work as intended.

Mark Wielaard mark@klomp.org
Wed May 5 20:05:03 GMT 2021


Hi,

On Wed, 2021-05-05 at 21:32 +0200, Mark Wielaard wrote:
> Now that we rely on --version and --help to generate documentation make
> sure that make distcheck checks those standard options work correctly.
> Also adjust find-debuginfo.sh[.1] rules slightly to make sure they the
> scripts are also checked (bin_SCRIPTS are, but dist_bin_SCRIPTS aren't).
> 
> 	* configure.ac (AM_INIT_AUTOMAKE): Add std-options.
> 	* Makefile.am (dist_bin_SCRIPTS): Change into...
> 	(bin_SCRIPTS): ... this, using top_srcdir.
> 	(TOP_CONFIGURE_AC): New variable, with comment explaining when
> 	.1 man pages are (re)generated.
> 	(debugedit.1): Use TOP_CONFIGURE_AC as dependency.
> 	(sepdebugcrcfix.1): Likewise.
> 	(find-debuginfo.sh.1): Likewise and depend on top_srcdir script.

Unfortunately this didn't work everywhere, newer automake don't add
scripts/find-debuginfo.sh to the dist. So I had to push a fixup:

commit e3ac91ca17e0196081bd350db3c8080cb531d3f2 (HEAD -> main)
Author: Mark Wielaard <mark@klomp.org>
Date:   Wed May 5 22:00:08 2021 +0200

    Makefile.am: Add scripts/find-debuginfo.sh to EXTRA_DIST
    
    Signed-off-by: Mark Wielaard <mark@klomp.org>

diff --git a/Makefile.am b/Makefile.am
index 5bf003b..ef972e8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,4 +67,4 @@ noinst_HEADERS= tools/ansidecl.h \
                tools/md5.h \
                tools/sha1.h
 
-EXTRA_DIST = README COPYING COPYING3 COPYING.LIB
+EXTRA_DIST = README COPYING COPYING3 COPYING.LIB scripts/find-debuginfo.sh

This wasn't helped by some of the buildbot workers not yet having
help2man installed (most have now, just the s390x, and ppc64/ppc64le
setups don't have it yet).

Cheers,

Mark


More information about the Debugedit mailing list