From 4c22ee425203d4b19e495403cf59437026f874ed Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Tue, 27 Mar 2012 17:23:52 +0800 Subject: libsemanage: Change to the default install path. --- recipes-security/selinux/libsemanage_2.1.6.bb | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/recipes-security/selinux/libsemanage_2.1.6.bb b/recipes-security/selinux/libsemanage_2.1.6.bb index 7333155..8359e68 100644 --- a/recipes-security/selinux/libsemanage_2.1.6.bb +++ b/recipes-security/selinux/libsemanage_2.1.6.bb @@ -23,7 +23,7 @@ FILES_${PN}-python = "${libdir}/python${PYTHON_BASEVERSION}/site-packages/*" FILES_${PN}-dbg += "${libdir}/python${PYTHON_BASEVERSION}/site-packages/.debug/*" do_compile_append() { - oe_runmake pywrap -j1 \ + oe_runmake pywrap \ INCLUDEDIR='${STAGING_INCDIR}' \ LIBDIR='${STAGING_LIBDIR}' \ PYLIBVER='python${PYTHON_BASEVERSION}' \ @@ -32,14 +32,18 @@ do_compile_append() { PYTHONLIBDIR='${PYLIB}' } -do_install_append() { +do_install() { + oe_runmake install \ + DESTDIR="${D}" \ + PREFIX="${D}/${prefix}" \ + INCLUDEDIR="${D}/${includedir}" \ + LIBDIR="${D}/${libdir}" \ + SHLIBDIR="${D}/${libdir}" + oe_runmake install-pywrap swigify \ DESTDIR=${D} \ PYLIBVER='python${PYTHON_BASEVERSION}' \ PYLIBDIR='${D}/${libdir}/$(PYLIBVER)' - cd ${D}${libdir} && \ - rm -f libsemanage.so && \ - ln -s ../../`basename ${libdir}`/libsemanage.so.1 libsemanage.so } BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf