richardphibel / rpms / rpm

Forked from rpms/rpm 2 years ago
Clone
c7b760
From 77007d68782b66f2d00d7b200516731246876dca Mon Sep 17 00:00:00 2001
c7b760
From: Panu Matilainen <pmatilai@redhat.com>
c7b760
Date: Thu, 27 May 2021 13:58:58 +0300
c7b760
Subject: [PATCH] Macroize find-debuginfo script location
c7b760
c7b760
Makes it easier to handle varying paths, mainly in preparation for the
c7b760
next step.
c7b760
c7b760
Backported for 4.14.3.
c7b760
---
c7b760
 macros.in | 4 +++-
c7b760
 1 file changed, 3 insertions(+), 1 deletion(-)
c7b760
c7b760
diff --git a/macros.in b/macros.in
c7b760
index a6069ee4d..be28a3b28 100644
c7b760
--- a/macros.in
c7b760
+++ b/macros.in
c7b760
@@ -82,6 +82,8 @@
c7b760
 %__remsh		%{__rsh}
c7b760
 %__strip		@__STRIP@
c7b760
 
c7b760
+%__find_debuginfo	%{_rpmconfigdir}/find-debuginfo.sh
c7b760
+
c7b760
 # XXX avoid failures if tools are not installed when rpm is built.
c7b760
 %__libtoolize		libtoolize
c7b760
 %__aclocal		aclocal
c7b760
@@ -177,7 +179,7 @@
c7b760
 #	the script.  See the script for details.
c7b760
 #
c7b760
 %__debug_install_post   \
c7b760
-    %{_rpmconfigdir}/find-debuginfo.sh \\\
c7b760
+    %{__find_debuginfo} \\\
c7b760
     %{?_smp_mflags} \\\
c7b760
     %{?_missing_build_ids_terminate_build:--strict-build-id} \\\
c7b760
     %{?_no_recompute_build_ids:-n} \\\
c7b760
-- 
c7b760
2.33.1
c7b760