1 From bd08eb0ae1312f347f49949481daa7c923752df2 Mon Sep 17 00:00:00 2001
2 From: Alexander Kanavin <alex.kanavin@gmail.com>
3 Date: Mon, 27 Feb 2017 09:43:30 +0200
4 Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for
5 default configuration and macros.
7 Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263]
8 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 3 files changed, 4 insertions(+), 4 deletions(-)
16 diff --git a/configure.ac b/configure.ac
17 index 09af7c4..9bd6903 100644
20 @@ -1055,7 +1055,7 @@ else
24 -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
25 +RPMCONFIGDIR="`echo ${libdir}/rpm`"
26 AC_SUBST(RPMCONFIGDIR)
29 diff --git a/macros.in b/macros.in
30 index a3aa7a9..62cee5c 100644
33 @@ -970,7 +970,7 @@ package or when debugging this package.\
34 %_sharedstatedir %{_prefix}/com
35 %_localstatedir %{_prefix}/var
37 -%_libdir %{_exec_prefix}/%{_lib}
39 %_includedir %{_prefix}/include
40 %_infodir %{_datadir}/info
41 %_mandir %{_datadir}/man
42 diff --git a/rpm.am b/rpm.am
43 index 82c2d7c..6341b51 100644
48 ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
49 -rpmlibexecdir = $(prefix)/lib/rpm
50 +rpmlibexecdir = $(libdir)/rpm
52 # Host independent config files
53 ## HACK: it probably should be $(datadir)/rpm
54 -rpmconfigdir = $(prefix)/lib/rpm
55 +rpmconfigdir = $(libdir)/rpm
57 # Libtool version (current-revision-age) for all our libraries
58 rpm_version_info = 9:0:1