summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSlava Barinov <v.barinov@samsung.com>2017-04-11 10:23:55 +0300
committerChan Lee <chan45.lee@samsung.com>2017-04-12 17:25:54 +0900
commit3f718db6429246475d37bb7cf8cf60fcdc601cfe (patch)
tree6c1043db37f3e4853109c17e2adc68f93bd594c0
parent155d89a76752e7dc3ed91771cc4841ccf6e8fdca (diff)
downloadrpm-3f718db6429246475d37bb7cf8cf60fcdc601cfe.tar.gz
rpm-3f718db6429246475d37bb7cf8cf60fcdc601cfe.tar.bz2
rpm-3f718db6429246475d37bb7cf8cf60fcdc601cfe.zip
Fix the script install proceduresandbox/dkson95/build
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@