summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2017-04-11 10:23:55 +0300
committerDongkyun Son <dongkyun.s@samsung.com>2017-04-12 03:55:20 -0700
commita950e65724d282f43fb31e06ccebe2411053ecf1 (patch)
tree6c1043db37f3e4853109c17e2adc68f93bd594c0
parentad7c00dcdf1572841198b3b8a29953bfe24cd583 (diff)
downloadrpm-a950e65724d282f43fb31e06ccebe2411053ecf1.tar.gz
rpm-a950e65724d282f43fb31e06ccebe2411053ecf1.tar.bz2
rpm-a950e65724d282f43fb31e06ccebe2411053ecf1.zip
When the %rpmhome is not set to libdir the install order is wrong. Change-Id: I5f79075298731ec1c60333c3ee0f5c583b07f16b Signed-off-by: Slava Barinov <v.barinov@samsung.com>
-rw-r--r--packaging/rpm.spec2
-rw-r--r--rpm.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/packaging/rpm.spec b/packaging/rpm.spec
index 92a555b41..b5109ffef 100644
--- a/packaging/rpm.spec
+++ b/packaging/rpm.spec
@@ -170,8 +170,8 @@ ln -s ../share/locale %{buildroot}%{rpmlibdir}/locale
%make_install
install -m 644 db3/db.h %{buildroot}%{_includedir}/rpm
mkdir -p %{buildroot}%{_sysconfdir}/rpm
-cp -a tizen_macros %{buildroot}%{rpmhome}
mkdir -p %{buildroot}%{rpmhome}/tizen
+cp -a tizen_macros %{buildroot}%{rpmhome}
install -m 755 %{SOURCE13} %{buildroot}%{rpmhome}/tizen
install -m 755 %{SOURCE23} %{buildroot}%{rpmhome}
install -m 644 %{SOURCE9} %{buildroot}%{rpmhome}/fileattrs/libsymlink.attr
diff --git a/rpm.am b/rpm.am
index 5722e1f10..9b533bb0d 100644
--- a/rpm.am
+++ b/rpm.am
@@ -1,6 +1,6 @@
# Internal binaries
-rpmlibexecdir = $(libdir)/rpm
+rpmlibexecdir = @RPMCONFIGDIR@
# Host independent config files
## HACK: it probably should be $(datadir)/rpm
-rpmconfigdir = $(libdir)/rpm
+rpmconfigdir = @RPMCONFIGDIR@