1From 7b2dd83d8fcd06af8e583b53da79ed0033793d46 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 27 Feb 2017 09:43:30 +0200
4Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
5 default configuration and macros.
6
7Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
10---
11 configure.ac | 2 +-
12 macros.in    | 2 +-
13 rpm.am       | 4 ++--
14 3 files changed, 4 insertions(+), 4 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index fe35a90fa..b2faec6f3 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -966,7 +966,7 @@ else
21     usrprefix=$prefix
22 fi
23
24-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
25+RPMCONFIGDIR="`echo ${libdir}/rpm`"
26 AC_SUBST(RPMCONFIGDIR)
27
28 AC_SUBST(OBJDUMP)
29diff --git a/macros.in b/macros.in
30index 35c8cf9df..9d8b2825c 100644
31--- a/macros.in
32+++ b/macros.in
33@@ -996,7 +996,7 @@ package or when debugging this package.\
34 %_sharedstatedir	%{_prefix}/com
35 %_localstatedir		%{_prefix}/var
36 %_lib			lib
37-%_libdir		%{_exec_prefix}/%{_lib}
38+%_libdir		@libdir@
39 %_includedir		%{_prefix}/include
40 %_infodir		%{_datadir}/info
41 %_mandir		%{_datadir}/man
42diff --git a/rpm.am b/rpm.am
43index 8e1dc2184..3d889ec86 100644
44--- a/rpm.am
45+++ b/rpm.am
46@@ -1,10 +1,10 @@
47 # Internal binaries
48 ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
49-rpmlibexecdir = $(prefix)/lib/rpm
50+rpmlibexecdir = $(libdir)/rpm
51
52 # Host independent config files
53 ## HACK: it probably should be $(datadir)/rpm
54-rpmconfigdir = $(prefix)/lib/rpm
55+rpmconfigdir = $(libdir)/rpm
56
57 # Libtool version (current-revision-age) for all our libraries
58 rpm_version_info = 10:3:1
59