diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-08-05 15:56:54 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-08-05 15:56:54 +0000 |
| commit | 795f228d21be86982bfeae49b9d94031ee7284f3 (patch) | |
| tree | 36270a713183ddf9d37f0a5b898678bbf2d18023 | |
| parent | 8837010e37002e999299a6cb4ee8d8486b0f420d (diff) | |
| parent | 3422a436880509c7f82a3ae5d5693c87ece7a42d (diff) | |
merge of '43b7d311b8108ccaa97f5955ea74f245fe291dc0'
and 'beea20d8bd60f3598225741e5395f689cd57bdf1'
| -rw-r--r-- | packages/gstreamer/gst-common.inc | 22 | ||||
| -rw-r--r-- | packages/gstreamer/gstreamer_0.10.17.bb | 2 |
2 files changed, 4 insertions, 20 deletions
diff --git a/packages/gstreamer/gst-common.inc b/packages/gstreamer/gst-common.inc index 04f3f309fa..c6a3fd057d 100644 --- a/packages/gstreamer/gst-common.inc +++ b/packages/gstreamer/gst-common.inc @@ -10,26 +10,10 @@ inherit autotools pkgconfig OE_LT_RPATH_ALLOW = "any" OE_LT_RPATH_ALLOW[export]="1" -do_stage() { - rm -rf ${STAGE_TEMP} - mkdir -p ${STAGE_TEMP} - oe_runmake DESTDIR="${STAGE_TEMP}" install - if [ -d ${STAGE_TEMP}/${includedir} ]; then - cp -fpPR ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR} - fi - for i in $(find ${STAGE_TEMP}/${libdir} -name "*.la") - do - - destdir=$(dirname $(echo $i | sed -e s,${STAGE_TEMP}/${libdir},${STAGING_LIBDIR},g)) - oenote "Installing library $i to $destdir" - oe_libinstall -s -so $(basename $i .la) $destdir - done +AUTOTOOLS_STAGE_PKGCONFIG = "1" - if [ -d ${STAGE_TEMP}/${datadir}/aclocal ]; then - install -d ${STAGING_DATADIR}/aclocal - cp -fpPR ${STAGE_TEMP}/${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal - fi - rm -rf ${STAGE_TEMP} +do_stage() { + autotools_stage_all } diff --git a/packages/gstreamer/gstreamer_0.10.17.bb b/packages/gstreamer/gstreamer_0.10.17.bb index b2e5daf671..94f1ef36cb 100644 --- a/packages/gstreamer/gstreamer_0.10.17.bb +++ b/packages/gstreamer/gstreamer_0.10.17.bb @@ -1,6 +1,6 @@ require gstreamer.inc -PR = "r1" +PR = "r2" SRC_URI += "file://po-makefile-fix.patch;patch=1" |