From: Junqian Gordon Xu Date: Sun, 6 Jan 2008 12:55:28 +0000 (+0000) Subject: flite: fix staging X-Git-Tag: Release-2010-05/1~8009 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb7952a208f1b5a00ab119984e31d811dbec83a4;p=openembedded.git flite: fix staging * headers have to go into ${STAGING_INCDIR}/flite --- diff --git a/packages/flite/flite-alsa_1.2.bb b/packages/flite/flite-alsa_1.2.bb index cde6db6d45..92db8c34f9 100644 --- a/packages/flite/flite-alsa_1.2.bb +++ b/packages/flite/flite-alsa_1.2.bb @@ -1,6 +1,6 @@ require flite.inc -PR = "r0" +PR = "r1" EXTRA_OECONF = "--with-audio=alsa --enable-shared" diff --git a/packages/flite/flite-alsa_1.3.bb b/packages/flite/flite-alsa_1.3.bb index b80e70c2cf..438fe38e0e 100644 --- a/packages/flite/flite-alsa_1.3.bb +++ b/packages/flite/flite-alsa_1.3.bb @@ -1,6 +1,6 @@ require flite.inc -PR = "r0" +PR = "r1" EXTRA_OECONF = "--with-audio=alsa --enable-shared" diff --git a/packages/flite/flite.inc b/packages/flite/flite.inc index 4c0e9de35c..64108c8390 100644 --- a/packages/flite/flite.inc +++ b/packages/flite/flite.inc @@ -30,9 +30,10 @@ do_install() { oe_runmake INSTALLBINDIR="${D}${bindir}" INSTALLLIBDIR="${D}${libdir}" INSTALLINCDIR="${D}${includedir}" install } - do_stage () { - install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/ + install -d ${STAGING_INCDIR}/flite + install -m 0644 ${S}/include/*.h ${STAGING_INCDIR}/flite/ + oe_libinstall -C lib -a -so libflite ${STAGING_LIBDIR} oe_libinstall -C lib -a -so libflite_cmu_time_awb ${STAGING_LIBDIR} oe_libinstall -C lib -a -so libflite_cmulex ${STAGING_LIBDIR} diff --git a/packages/flite/flite_1.2.bb b/packages/flite/flite_1.2.bb index e2ec237795..5b8ff06358 100644 --- a/packages/flite/flite_1.2.bb +++ b/packages/flite/flite_1.2.bb @@ -1,6 +1,6 @@ require flite.inc -PR = "r4" +PR = "r5" EXTRA_OECONF = "--with-audio=oss --enable-shared" diff --git a/packages/flite/flite_1.3.bb b/packages/flite/flite_1.3.bb index 564557d13f..b028510a56 100644 --- a/packages/flite/flite_1.3.bb +++ b/packages/flite/flite_1.3.bb @@ -1,6 +1,6 @@ require flite.inc -PR = "r1" +PR = "r2" EXTRA_OECONF = "--with-audio=oss --enable-shared"