From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (wildebeest.demon.nl [212.238.236.112]) by sourceware.org (Postfix) with ESMTPS id 5D983385803B for ; Wed, 5 May 2021 20:05:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5D983385803B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mark@klomp.org Received: from tarox.wildebeest.org (tarox.wildebeest.org [172.31.17.39]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id E0476302BBED for ; Wed, 5 May 2021 22:05:03 +0200 (CEST) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id CF3BD413CD48; Wed, 5 May 2021 22:05:03 +0200 (CEST) Message-ID: <5b190b6edb6b7b79f136f48643e23f685ef16b8a.camel@klomp.org> Subject: Re: [COMMITTED] automake: Add std-options to check --version and --help work as intended. From: Mark Wielaard To: debugedit@sourceware.org Date: Wed, 05 May 2021 22:05:03 +0200 In-Reply-To: <20210505193233.20312-1-mark@klomp.org> References: <20210505193233.20312-1-mark@klomp.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Mailer: Evolution 3.28.5 (3.28.5-10.el7) Mime-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: debugedit@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: debugedit development mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 May 2021 20:05:13 -0000 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). >=20 > * 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 Date: Wed May 5 22:00:08 2021 +0200 Makefile.am: Add scripts/find-debuginfo.sh to EXTRA_DIST =20 Signed-off-by: Mark Wielaard diff --git a/Makefile.am b/Makefile.am index 5bf003b..ef972e8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,4 +67,4 @@ noinst_HEADERS=3D tools/ansidecl.h \ tools/md5.h \ tools/sha1.h =20 -EXTRA_DIST =3D README COPYING COPYING3 COPYING.LIB +EXTRA_DIST =3D 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