summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/expect
diff options
context:
space:
mode:
authorYue Tao <Yue.Tao@windriver.com>2015-05-28 15:24:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:08:41 +0100
commit41f74d0a05cec275243271e8e6b4dceb16e4daa4 (patch)
tree594e7b20e5fc3252b572bba2cb3a30278632edff /meta/recipes-devtools/expect
parentd4917c0ab8b022b1e28ef32d7b3a46f9bfffa690 (diff)
downloadopenembedded-core-41f74d0a05cec275243271e8e6b4dceb16e4daa4.tar.gz
openembedded-core-41f74d0a05cec275243271e8e6b4dceb16e4daa4.tar.bz2
openembedded-core-41f74d0a05cec275243271e8e6b4dceb16e4daa4.zip
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@windriver.com> Signed-off-by: Kai Kang <kai.kang@windriver.com>
Diffstat (limited to 'meta/recipes-devtools/expect')
-rw-r--r--meta/recipes-devtools/expect/expect_5.45.bb11
1 files 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 264f00718b..3c2aab417c 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 \
"