[oe-commits] Yue Tao : expect: replace the STAGING_INCDIR with includedir

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 41f74d0a05cec275243271e8e6b4dceb16e4daa4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=41f74d0a05cec275243271e8e6b4dceb16e4daa4

Author: Yue Tao <Yue.Tao at windriver.com>
Date:   Thu May 28 15:24:32 2015 +0800

expect: replace the STAGING_INCDIR with includedir

The build path is included in expect-dev rpm package. It should not set
the STAGING_INCDIR statically. The includedir will be replaced with
appropriate value in different stage.

Signed-off-by: Yue Tao <Yue.Tao at windriver.com>
Signed-off-by: Kai Kang <kai.kang at windriver.com>

---

 meta/recipes-devtools/expect/expect_5.45.bb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta/recipes-devtools/expect/expect_5.45.bb b/meta/recipes-devtools/expect/expect_5.45.bb
index 264f007..3c2aab4 100644
--- a/meta/recipes-devtools/expect/expect_5.45.bb
+++ b/meta/recipes-devtools/expect/expect_5.45.bb
@@ -40,8 +40,7 @@ do_install_append() {
         sed -e 's|$dir|${libdir}|' -i ${D}${libdir}/expect${PV}/pkgIndex.tcl
 }
 
-EXTRA_OECONF += "--includedir=${STAGING_INCDIR} \
-                 --with-tcl=${STAGING_LIBDIR} \
+EXTRA_OECONF += "--with-tcl=${STAGING_LIBDIR} \
                  --with-tclinclude=${STAGING_INCDIR}/tcl8.6 \
                  --enable-shared \
                  --enable-threads \
@@ -53,10 +52,10 @@ FILES_${PN}-dbg += "${libdir}/${BPN}${PV}/.debug \
                     ${libdir}/.debug \
                    "
 FILES_${PN}-dev = "${libdir_native}/expect${PV}/libexpect*.so \
-                   ${STAGING_INCDIR}/expect.h \
-                   ${STAGING_INCDIR}/expect_tcl.h \
-                   ${STAGING_INCDIR}/expect_comm.h \
-                   ${STAGING_INCDIR}/tcldbg.h \
+                   ${includedir}/expect.h \
+                   ${includedir}/expect_tcl.h \
+                   ${includedir}/expect_comm.h \
+                   ${includedir}/tcldbg.h \
                    ${includedir}/*.h \
                   "