aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQi.Chen@windriver.com <Qi.Chen@windriver.com>2015-11-09 09:34:20 +0800
committerMartin Jansa <Martin.Jansa@gmail.com>2015-12-18 12:43:22 +0100
commit626236af04f23b9c6beef59e64274655348cfa4b (patch)
tree40b5adc1ed12269b7930a0ad8491112987e3f426
parent501425295d90406182789cce96400f53e2f79a64 (diff)
downloadmeta-openembedded-contrib-626236af04f23b9c6beef59e64274655348cfa4b.tar.gz
rrdtool: install python site packages into libdir
Fix the do_configure function to suite the latest version to install python libraries into ${libdir}. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
index 666ace92fc0..4d6318cbde8 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
@@ -77,8 +77,8 @@ do_configure() {
#remove the dependency of perl-shared:Makefile
#or perl-shared/Makefile will be regenerated
#if any code touch bindings/Makefile after below perl bindings code
- sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \
- --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \
+ sed -i -e "s:python/setup.py install:python/setup.py install \
+ --install-lib=${PYTHON_SITEPACKAGES_DIR}:" \
-e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \
${B}/bindings/Makefile
@@ -111,8 +111,8 @@ RDEPENDS_${PN}-perl = "perl perl-module-lib perl-module-getopt-long perl-module-
DESCRIPTION_${PN}-python = \
"The ${PN}-python package includes RRDtool bindings for python."
-FILES_${PN}-python = "${nonarch_libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
+FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*"
RDEPENDS_${PN}-python = "python"
FILES_${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \
- ${nonarch_libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug"
+ ${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug"