aboutsummaryrefslogtreecommitdiffstats
path: root/glib-2.0
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-04-01 17:57:34 +0000
committerChris Larson <clarson@kergoth.com>2004-04-01 17:57:34 +0000
commit7d0f4d1ff2349647def5f78e6f07d4ce0bc7fffc (patch)
tree0e273dc0c82ac47904f723db0eaaa44679f0df66 /glib-2.0
parent0851f86cd64bd723f578846da6676c8782ac65d7 (diff)
downloadopenembedded-7d0f4d1ff2349647def5f78e6f07d4ce0bc7fffc.tar.gz
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
Diffstat (limited to 'glib-2.0')
-rw-r--r--glib-2.0/glib-2.0-native_2.2.3.oe4
-rw-r--r--glib-2.0/glib-2.0_2.2.3.oe4
2 files changed, 4 insertions, 4 deletions
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/
}