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 5F86939574D5 for ; Tue, 18 May 2021 17:14:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5F86939574D5 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 (ip-213-127-36-226.ip.prioritytelecom.net [213.127.36.226]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 06B52302BBED; Tue, 18 May 2021 19:14:34 +0200 (CEST) Received: by tarox.wildebeest.org (Postfix, from userid 1000) id 32F28413CD48; Tue, 18 May 2021 19:14:34 +0200 (CEST) From: Mark Wielaard To: debugedit@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] Rename find-debuginfo.sh to find-debuginfo Date: Tue, 18 May 2021 19:14:26 +0200 Message-Id: <20210518171426.24743-1-mark@klomp.org> X-Mailer: git-send-email 2.18.4 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, 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: Tue, 18 May 2021 17:14:44 -0000 Even though it is currently a bash script we install it as a normal program. So simply install it without the .sh suffix. To get the VERSION right in the script make it an AC_CONFIG_FILE (from find-debuginfo.in). This also fixes the man page name and version. * .gitignore: Remove find-debuginfo.sh.1. Add scripts/find-debuginfo and find-debuginfo.1 * configure.ac (AC_CONFIG_FILES): Add scripts/find-debuginfo. * Makefile.am (bin_SCRIPTS): Rename find-debuginfo.sh to find-debuginfo. (dist_man_MANS): Rename find-debuginfo.sh.1 to find-debuginfo.1. (find-debuginfo.sh.1): Rename to ... (find-debuginfo.1): ...this and update invocation. (EXTRA_DIST): Rename scripts/find-debuginfo.sh to scripts/find-debuginfo. * scripts/find-debuginfo.sh: Rename to ... * scripts/find-debuginfo.in: ...this. Change all find-debuginfo.sh to find-debuginfo. Use @VERSION@ for --version. Signed-off-by: Mark Wielaard --- .gitignore | 3 ++- Makefile.am | 12 ++++++------ configure.ac | 1 + scripts/{find-debuginfo.sh => find-debuginfo.in} | 8 ++++---- 4 files changed, 13 insertions(+), 11 deletions(-) rename scripts/{find-debuginfo.sh => find-debuginfo.in} (98%) diff --git a/.gitignore b/.gitignore index 3e81e87..ae33e64 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,8 @@ debugedit.1 sepdebugcrcfix sepdebugcrcfix.1 -find-debuginfo.sh.1 +scripts/find-debuginfo +find-debuginfo.1 atconfig atlocal diff --git a/Makefile.am b/Makefile.am index 584e532..645a502 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,8 +24,8 @@ AM_CFLAGS = -Wall # All our programs bin_PROGRAMS = debugedit sepdebugcrcfix -# Install find-debuginfo.sh in $(bindir) and distribute it. -bin_SCRIPTS = $(top_srcdir)/scripts/find-debuginfo.sh +# Install find-debuginfo in $(bindir) and distribute it. +bin_SCRIPTS = $(top_srcdir)/scripts/find-debuginfo debugedit_SOURCES = tools/debugedit.c \ tools/hashtab.c \ @@ -39,7 +39,7 @@ sepdebugcrcfix_CFLAGS = @LIBELF_CFLAGS@ $(AM_CFLAGS) sepdebugcrcfix_LDADD = @LIBELF_LIBS@ # Manual pages are generated for dist -dist_man_MANS = debugedit.1 sepdebugcrcfix.1 find-debuginfo.sh.1 +dist_man_MANS = debugedit.1 sepdebugcrcfix.1 find-debuginfo.1 # The 'case' ensures the man pages are only generated if the corresponding # source script (the first prerequisite) or configure.ac (for the version) @@ -64,14 +64,14 @@ sepdebugcrcfix.1: tools/sepdebugcrcfix.c configure.ac sepdebugcrcfix$(EXEEXT) esac # Since the script isn't generated this doesn't need any special casing. -find-debuginfo.sh.1: $(top_srcdir)/scripts/find-debuginfo.sh +find-debuginfo.1: $(top_srcdir)/scripts/find-debuginfo $(HELP2MAN) -N --output=$@ \ --name='finds debuginfo and processes it' \ - $(top_srcdir)/scripts/find-debuginfo.sh + $(top_srcdir)/scripts/find-debuginfo noinst_HEADERS= tools/ansidecl.h \ tools/hashtab.h \ tools/md5.h \ tools/sha1.h -EXTRA_DIST = README COPYING COPYING3 COPYING.LIB scripts/find-debuginfo.sh +EXTRA_DIST = README COPYING COPYING3 COPYING.LIB scripts/find-debuginfo diff --git a/configure.ac b/configure.ac index d11467e..d1d8969 100644 --- a/configure.ac +++ b/configure.ac @@ -100,4 +100,5 @@ AC_SUBST([GZ_NONE_FLAG]) # And generate the output files. AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([scripts/find-debuginfo], [chmod +x scripts/find-debuginfo]) AC_OUTPUT diff --git a/scripts/find-debuginfo.sh b/scripts/find-debuginfo.in similarity index 98% rename from scripts/find-debuginfo.sh rename to scripts/find-debuginfo.in index 4f7ebef..82fac25 100755 --- a/scripts/find-debuginfo.sh +++ b/scripts/find-debuginfo.in @@ -1,5 +1,5 @@ #!/bin/bash -#find-debuginfo.sh - automagically generate debug info and file list +#find-debuginfo - automagically generate debug info and file list #for inclusion in an rpm spec file. # Copyright (C) 2002-2021 rpm and debugedit contributors @@ -20,7 +20,7 @@ help() { cat <<'EOF' -Usage: find-debuginfo.sh [OPTION]... [builddir] +Usage: find-debuginfo [OPTION]... [builddir] automagically generates debug info and file lists Options: @@ -70,7 +70,7 @@ the -l filelist file, or whose names match the -p pattern. The -p argument is an grep -E -style regexp matching the a file name, and must not use anchors (^ or $). -The --run-dwz flag instructs find-debuginfo.sh to run the dwz utility +The --run-dwz flag instructs find-debuginfo to run the dwz utility if available, and --dwz-low-mem-die-limit and --dwz-max-die-limit provide detailed limits. See dwz(1) -l and -L option for details. Use --dwz-single-file-mode to disable multi-file mode, see dwz(1) -m @@ -239,7 +239,7 @@ while [ $# -gt 0 ]; do shift ;; --version) - echo "debugedit find-debuginfo.sh" + echo "find-debuginfo @VERSION@" done=true; ;; --help) -- 2.18.4