aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/gtk+/gtk+.inc
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2010-01-31 17:14:17 +0100
committerKoen Kooi <koen@openembedded.org>2010-01-31 17:16:28 +0100
commit741a2834cb11bb498aef4522e1857a35e14c8da6 (patch)
treeb876770015f72fb64c024f8a949b94eb0a29d876 /recipes/gtk+/gtk+.inc
parentc6d759bc19db2f2027309137f67b2618fcfdb564 (diff)
downloadopenembedded-741a2834cb11bb498aef4522e1857a35e14c8da6.tar.gz
gtk+: don't install the pixbug-csource tool when building -native, it doesn't work properly
* the work around involved cleaning up old recipes as well, new-style staging here we come!
Diffstat (limited to 'recipes/gtk+/gtk+.inc')
-rw-r--r--recipes/gtk+/gtk+.inc20
1 files changed, 4 insertions, 16 deletions
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index 610428821f..e619a6af28 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -51,26 +51,14 @@ RRECOMMENDS_${PN} = " ${NEATSTUFF} "
RRECOMMENDS_${PN}_linux = " ${NEATSTUFF} glibc-gconv-iso8859-1 "
RRECOMMENDS_${PN}_linux-gnueabi = " ${NEATSTUFF} glibc-gconv-iso8859-1"
-do_stage () {
- oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C contrib/gdk-pixbuf-xlib libgdk_pixbuf_xlib-2.0 ${STAGING_LIBDIR}
- oe_libinstall -so -C gdk-pixbuf libgdk_pixbuf-2.0 ${STAGING_LIBDIR}
- if test -d modules/other/gail/libgail-util ; then
- oe_libinstall -so -C modules/other/gail/libgail-util libgailutil ${STAGING_LIBDIR}
- fi
-
- autotools_stage_includes
-
- mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
- install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
+do_install_append () {
+ mkdir -p ${D}${libdir}/gtk-2.0/include
+ install -m 0644 gdk/gdkconfig.h ${D}${libdir}/gtk-2.0/include/gdkconfig.h
# Copy over all headers, since the maemo stuff needs access to the private api. *sigh*
- cp gtk/*.h ${STAGING_INCDIR}/gtk-2.0/gtk/
+ cp gtk/*.h ${D}${includedir}/gtk-2.0/gtk/
install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
-}
-do_install_append () {
install -d ${D}${sysconfdir}/gtk-2.0
rm -f ${D}${libdir}/gtk-2.0/*/*.la ${D}${libdir}/gtk-2.0/${LIBV}/*/*.la
}