summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2010-10-12 16:58:09 +0300
committerPanu Matilainen <pmatilai@redhat.com>2010-10-12 17:05:17 +0300
commitec6226dd17c674f174be8cfdecb07ac78e6019bb (patch)
tree04cc3e9d62a51527ab7707b0f175b6198fbc817a
parenteea47aa9a7e7779cb35e8e6e690424427fe243c1 (diff)
downloadlibrpm-tizen-ec6226dd17c674f174be8cfdecb07ac78e6019bb.tar.gz
librpm-tizen-ec6226dd17c674f174be8cfdecb07ac78e6019bb.tar.bz2
librpm-tizen-ec6226dd17c674f174be8cfdecb07ac78e6019bb.zip
Move plugins out of rpm config directory
- Plugins are by their very nature arch specific, while /usr/lib/rpm is a hodgepodge of all sorts of ... stuff, most of which is arch-independent and all. Use %{_libdir}/rpm-plugins to cleanly differentiate 32 vs 64bit plugin paths
-rw-r--r--macros.in2
-rw-r--r--plugins/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/macros.in b/macros.in
index 3a0cfa4de..73a67941a 100644
--- a/macros.in
+++ b/macros.in
@@ -1159,7 +1159,7 @@ done \
#------------------------------------------------------------------------------
# Collection specific macros
-%__plugindir %{_rpmconfigdir}/plugins
+%__plugindir %{_libdir}/rpm-plugins
%__collection_font %{__plugindir}/exec.so /usr/bin/fc-cache
%__collection_java %{__plugindir}/exec.so /usr/bin/rebuild-gcj-db
%__collection_sepolicy %{__plugindir}/sepolicy.so
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 25774c42c..b9fd8235f 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS += -DLIBRPMALIAS_FILENAME="\"rpmpopt-${VERSION}\""
AM_LDFLAGS = -avoid-version -module -shared
-pluginsdir = $(rpmconfigdir)/plugins
+pluginsdir = $(libdir)/rpm-plugins
plugins_LTLIBRARIES = exec.la sepolicy.la