libidl - Firefox uses the libIDL-config-2 script instead of pkgconfig

diff --git a/packages/libidl/libidl_0.8.3.bb b/packages/libidl/libidl_0.8.3.bb
index 5a6f580..e743247 100644 (file)
--- a/packages/libidl/libidl_0.8.3.bb
+++ b/packages/libidl/libidl_0.8.3.bb
@@ -2,13 +2,16 @@ LICENSE = "LGPL"
 DESCRIPTION = "Library for parsing CORBA IDL files"
 SECTION = "gnome/libs"
 DEPENDS = "glib-2.0"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
 S = "${WORKDIR}/libIDL-${PV}"
 
 inherit autotools pkgconfig
 
+# Firefox uses the libIDL-config-2 script instead of pkgconfig (for some
+# strange reason - so we do some sed fu to fix the path there
+
 do_stage() {
        oe_runmake install \
                prefix=${STAGING_DIR} \
@@ -17,6 +20,9 @@ do_stage() {
                libdir=${STAGING_LIBDIR} \
                datadir=${STAGING_DATADIR} \
                infodir=${STAGING_INFODIR}
+       
+       cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
+       cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
 }
 
 FILES_${PN} = "${libdir}/*.so.*"

diff --git a/packages/libidl/libidl_0.8.6.bb b/packages/libidl/libidl_0.8.6.bb
index ee63b92..4265423 100644 (file)
--- a/packages/libidl/libidl_0.8.6.bb
+++ b/packages/libidl/libidl_0.8.6.bb
@@ -2,15 +2,21 @@ LICENSE = "LGPL"
 DESCRIPTION = "Library for parsing CORBA IDL files"
 SECTION = "gnome/libs"
 DEPENDS = "glib-2.0"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libIDL/0.8/libIDL-${PV}.tar.bz2"
 S = "${WORKDIR}/libIDL-${PV}"
 
 inherit autotools pkgconfig
 
+# Firefox uses the libIDL-config-2 script instead of pkgconfig (for some
+# strange reason - so we do some sed fu to fix the path there
+
 do_stage() {
        autotools_stage_all
+       
+       cp ${STAGING_BINDIR}/libIDL-config-2 ${STAGING_BINDIR}/libIDL-config-2.orig
+       cat ${STAGING_BINDIR}/libIDL-config-2.orig | sed -e 's:${includedir}:${STAGING_INCDIR}:' > ${STAGING_BINDIR}/libIDL-config-2
 }
 
 FILES_${PN} = "${libdir}/*.so.*"