[oe-commits] org.oe.dev packages/qt4/qt_staging.inc: Fix place of the include and library directory

[freyther commit]

packages/qt4/qt_staging.inc: Fix place of the include and library directory

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 49e39c42b944dda8eed607394e1849029b9f527f
ViewMTN: http://monotone.openembedded.org/revision/info/49e39c42b944dda8eed607394e1849029b9f527f
Files:
1
packages/qt4/qt_staging.inc
Diffs:

#
# mt diff -r5d2b4cb48bd09ae54e5d6f1258c55cd6e15f09cc -r49e39c42b944dda8eed607394e1849029b9f527f
#
# 
# 
# patch "packages/qt4/qt_staging.inc"
#  from [29e47cc09119f562a481e833d78686b7dbe5ae42]
#    to [426479a75ece31757e047679175820b2fdf3fcfb]
# 
============================================================
--- packages/qt4/qt_staging.inc	29e47cc09119f562a481e833d78686b7dbe5ae42
+++ packages/qt4/qt_staging.inc	426479a75ece31757e047679175820b2fdf3fcfb
@@ -12,13 +12,13 @@ do_stage() {
     mkdir -p ${STAGE_TEMP}
     oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
 
-    install -d ${STAGING_INCDIR}/${QT_DIR_NAME}
+    install -d ${STAGING_INCDIR}/
     install -d ${STAGING_LIBDIR}/${QT_DIR_NAME}
-    cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/${QT_DIR_NAME}/
+    cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/
 
     for i in ${STAGE_TEMP}/${libdir}/*.la
     do
-        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4
+        oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/${QT_DIR_NAME}
     done
 
     rm -rf ${STAGE_TEMP}