This commit is contained in:
Mario Fetka
2023-04-06 11:47:15 +02:00
parent 011cd6e696
commit 1f44a2d3b4
96 changed files with 3912 additions and 51 deletions

View File

@@ -0,0 +1,32 @@
--- a/configure.ac
+++ b/configure.ac
@@ -865,13 +865,7 @@ AC_ARG_WITH([rundir],
AC_DEFINE_UNQUOTED([RUNDIR],["${RUNDIR}"],[run-time variable directory])
AC_SUBST(RUNDIR)
-if test X"$prefix" = XNONE ; then
- usrprefix="$ac_default_prefix"
-else
- usrprefix=$prefix
-fi
-
-RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"
+RPMCONFIGDIR="`echo ${libexecdir}/rpm/`"
AC_SUBST(RPMCONFIGDIR)
AC_SUBST(OBJDUMP)
--- 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 = $(pkglibexecdir)
# Host independent config files
## HACK: it probably should be $(datadir)/rpm
-rpmconfigdir = $(prefix)/lib/rpm
+rpmconfigdir = $(pkglibexecdir)
# Libtool version (current-revision-age) for all our libraries
rpm_version_info = 11:0:2

View File

@@ -0,0 +1,26 @@
diff --git a/Makefile.am b/Makefile.am
index 587cfa7..498abfb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,7 +177,7 @@ EXTRA_DIST += rpmpopt.in
usrsrcdir = $(prefix)/src
-rpmvardir = $(localstatedir)/lib/rpm
+rpmvardir = $(localstatedir)/rpm
rpmvar_DATA =
install-exec-hook:
diff --git a/macros.in b/macros.in
index ae46fcb..213b53c 100644
--- a/macros.in
+++ b/macros.in
@@ -155,7 +155,7 @@
%_bzip2bin %{__bzip2}
# The location of the rpm database file(s).
-%_dbpath %{_var}/lib/rpm
+%_dbpath %{_var}/rpm
# The location of the rpm database file(s) after "rpm --rebuilddb".
%_dbpath_rebuild %{_dbpath}