summaryrefslogtreecommitdiff
path: root/compositeext
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-04-01 17:57:34 +0000
committerChris Larson <clarson@kergoth.com>2004-04-01 17:57:34 +0000
commit7d0f4d1ff2349647def5f78e6f07d4ce0bc7fffc (patch)
tree0e273dc0c82ac47904f723db0eaaa44679f0df66 /compositeext
parent0851f86cd64bd723f578846da6676c8782ac65d7 (diff)
Merge http://openembedded.bkbits.net/packages
into linux.local:/home/kergoth/code/packages 2004/03/31 12:17:45-05:00 local!kergoth appweb_1.0.2.oe: Correct LD_LIBRARY_PATH referencing itself. tremor_20030325.oe: Correct the tremor include path passed into the staging make install. 2004/03/30 21:40:59-05:00 local!kergoth Some fixups per the latest staging changes. BKrev: 406c580emotmj9yxCNGAhNEinlE4uw
Diffstat (limited to 'compositeext')
-rw-r--r--compositeext/compositeext-cvs.oe11
1 files changed, 5 insertions, 6 deletions
diff --git a/compositeext/compositeext-cvs.oe b/compositeext/compositeext-cvs.oe
index 4efd297b34..f55abf598a 100644
--- a/compositeext/compositeext-cvs.oe
+++ b/compositeext/compositeext-cvs.oe
@@ -11,10 +11,9 @@ S = "${WORKDIR}/CompositeExt"
inherit autotools pkgconfig
do_stage() {
- oe_runmake install DESTDIR=${STAGING_DIR} \
- bindir=/build/bin \
- includedir=/target/include \
- libdir=/target/lib \
- datadir=/share
- prefix=
+ oe_runmake install prefix=${STAGING_DIR} \
+ bindir=${STAGING_BINDIR} \
+ includedir=${STAGING_INCDIR} \
+ libdir=${STAGING_LIBDIR} \
+ datadir=${STAGING_DATADIR}
}