Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 1 | From 7b2dd83d8fcd06af8e583b53da79ed0033793d46 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Mon, 27 Feb 2017 09:43:30 +0200 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 4 | Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 5 | default configuration and macros. |
| 6 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 7 | Upstream-Status: Denied [https://github.com/rpm-software-management/rpm/pull/263] |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 8 | Signed-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 | |
| 16 | diff --git a/configure.ac b/configure.ac |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 17 | index fe35a90fa..b2faec6f3 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 18 | --- a/configure.ac |
| 19 | +++ b/configure.ac |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 20 | @@ -966,7 +966,7 @@ else |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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) |
| 29 | diff --git a/macros.in b/macros.in |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 30 | index 35c8cf9df..9d8b2825c 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 31 | --- a/macros.in |
| 32 | +++ b/macros.in |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 33 | @@ -996,7 +996,7 @@ package or when debugging this package.\ |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 |
| 42 | diff --git a/rpm.am b/rpm.am |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 43 | index 8e1dc2184..3d889ec86 100644 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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 |
Andrew Geissler | c926e17 | 2021-05-07 16:11:35 -0500 | [diff] [blame] | 58 | rpm_version_info = 10:3:1 |