From 7d0f4d1ff2349647def5f78e6f07d4ce0bc7fffc Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 1 Apr 2004 17:57:34 +0000 Subject: Merge http://openembedded.bkbits.net/packages into linux.local:/home/kergoth/code/packages 2004/03/31 12:17:45-05:00 local!kergoth appweb_1.0.2.oe: Correct LD_LIBRARY_PATH referencing itself. tremor_20030325.oe: Correct the tremor include path passed into the staging make install. 2004/03/30 21:40:59-05:00 local!kergoth Some fixups per the latest staging changes. BKrev: 406c580emotmj9yxCNGAhNEinlE4uw --- glib-2.0/glib-2.0-native_2.2.3.oe | 4 ++-- glib-2.0/glib-2.0_2.2.3.oe | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'glib-2.0') diff --git a/glib-2.0/glib-2.0-native_2.2.3.oe b/glib-2.0/glib-2.0-native_2.2.3.oe index 4203ecf805..0e0c5786e3 100644 --- a/glib-2.0/glib-2.0-native_2.2.3.oe +++ b/glib-2.0/glib-2.0-native_2.2.3.oe @@ -106,8 +106,8 @@ do_stage () { install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DIR}/share/aclocal/ - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DIR}/share/aclocal/ + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/ + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/ } do_install () { diff --git a/glib-2.0/glib-2.0_2.2.3.oe b/glib-2.0/glib-2.0_2.2.3.oe index 131bf18c34..b935d4d736 100644 --- a/glib-2.0/glib-2.0_2.2.3.oe +++ b/glib-2.0/glib-2.0_2.2.3.oe @@ -102,6 +102,6 @@ do_stage () { install -m 0644 ${S}/gobject/gvaluetypes.h ${STAGING_INCDIR}/glib-2.0/gobject/gvaluetypes.h install -m 0644 ${S}/gobject/gobjectnotifyqueue.c ${STAGING_INCDIR}/glib-2.0/gobject/gobjectnotifyqueue.c install -m 0644 ${S}/gobject/gmarshal.h ${STAGING_INCDIR}/glib-2.0/gobject/gmarshal.h - install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DIR}/share/aclocal/ - install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DIR}/share/aclocal/ + install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/ + install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/ } -- cgit v1.2.3