diff options
| author | Holger Freyther <zecke@selfish.org> | 2004-06-04 17:36:28 +0000 |
|---|---|---|
| committer | Holger Freyther <zecke@selfish.org> | 2004-06-04 17:36:28 +0000 |
| commit | 493b10222886a1d47ea2a055f259f56f6edb818c (patch) | |
| tree | 4aea4ab5f9b842411dd660874c5ac786038e11e0 /gnome | |
| parent | aff70eed97914336b3ebaefaeb6c41312f4aa5f0 (diff) | |
Merge bk://openembedded@openembedded.bkbits.net/packages
into handhelds.org:/home/ich/programming/oe/oe-packages-exported
2004/06/04 19:34:06+02:00 (none)!ich
Changes to make oemake gpe-image work on a system that doesn't have any
g*-dev packages installed.
-GCONF2.6.1 tried to call /usr/bin/orbit-idl-2 from both compile and install
-Matchbox 0.8 + 0.8.1 get patched to use gconf and 0.8.2 does
have it by default. So make them depend on gconf
2004/06/04 16:26:26+02:00 (none)!ich
Local merge
2004/06/04 16:23:07+02:00 (none)!ich
BKrev: 40c0b31cCucX126IZpg4h-XKtiSjVg
Diffstat (limited to 'gnome')
| -rw-r--r-- | gnome/gconf_2.6.1.oe | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe index a893ae896a..6c13efc9aa 100644 --- a/gnome/gconf_2.6.1.oe +++ b/gnome/gconf_2.6.1.oe @@ -3,6 +3,7 @@ DESCRIPTION = "GNOME configuration database system" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \ file://backends.patch;patch=1" DEPENDS = "orbit2 glib-2.0 gettext-native libxml2" +ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2" FILES_${PN} += " ${libdir}/GConf/*" @@ -15,7 +16,7 @@ inherit autotools pkgconfig HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" do_compile() { - oe_runmake ORBIT_IDL="`which orbit-idl-2`" + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" } do_stage() { @@ -24,3 +25,7 @@ do_stage() { ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 } + +do_install() { + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install +} |