| From 8d013fe154a162305f76141151baf767dd04b598 Mon Sep 17 00:00:00 2001 |
| From: Alexander Kanavin <alex.kanavin@gmail.com> |
| Date: Mon, 27 Feb 2017 09:43:30 +0200 |
| Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for |
| default configuration and macros. |
| |
| Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] |
| Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| |
| --- |
| configure.ac | 2 +- |
| macros.in | 2 +- |
| rpm.am | 4 ++-- |
| 3 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/configure.ac b/configure.ac |
| index eb7d6941b..10a889b5d 100644 |
| --- a/configure.ac |
| +++ b/configure.ac |
| @@ -871,7 +871,7 @@ else |
| usrprefix=$prefix |
| fi |
| |
| -RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`" |
| +RPMCONFIGDIR="`echo ${libdir}/rpm`" |
| AC_SUBST(RPMCONFIGDIR) |
| |
| AC_SUBST(OBJDUMP) |
| diff --git a/macros.in b/macros.in |
| index a1f795e5f..689e784ef 100644 |
| --- a/macros.in |
| +++ b/macros.in |
| @@ -933,7 +933,7 @@ package or when debugging this package.\ |
| %_sharedstatedir %{_prefix}/com |
| %_localstatedir %{_prefix}/var |
| %_lib lib |
| -%_libdir %{_exec_prefix}/%{_lib} |
| +%_libdir @libdir@ |
| %_includedir %{_prefix}/include |
| %_infodir %{_datadir}/info |
| %_mandir %{_datadir}/man |
| diff --git a/rpm.am b/rpm.am |
| index 7b57f433b..9bbb9ee96 100644 |
| --- a/rpm.am |
| +++ b/rpm.am |
| @@ -1,10 +1,10 @@ |
| # Internal binaries |
| ## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm |
| -rpmlibexecdir = $(prefix)/lib/rpm |
| +rpmlibexecdir = $(libdir)/rpm |
| |
| # Host independent config files |
| ## HACK: it probably should be $(datadir)/rpm |
| -rpmconfigdir = $(prefix)/lib/rpm |
| +rpmconfigdir = $(libdir)/rpm |
| |
| # Libtool version (current-revision-age) for all our libraries |
| rpm_version_info = 11:0:2 |