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
author: Chris Larson <clarson@kergoth.com> 2004-04-01 17:57:34 +0000
committer: Chris Larson <clarson@kergoth.com> 2004-04-01 17:57:34 +0000
commit: 7d0f4d1ff2349647def5f78e6f07d4ce0bc7fffc (patch)
tree: 0e273dc0c82ac47904f723db0eaaa44679f0df66
parent: 0851f86cd64bd723f578846da6676c8782ac65d7 (diff)
41 files changed, 245 insertions, 162 deletions
diff --git a/appweb/appweb_1.0.2.oe b/appweb/appweb_1.0.2.oe
index 6b271767e1..66911451ce 100644
--- a/appweb/appweb_1.0.2.oe
+++ b/appweb/appweb_1.0.2.oe
@@ -61,7 +61,8 @@ EXTRA_OECONF = "--os ${APPWEB_OS} --target ${APPWEB_TARGET} \
 		--disable-ssl"
 EXTRA_OEMAKE = "'CC=${CC}' 'AR=${AR}' 'CPP=${CXX}' 'LD=${CC}'"
 
-export LD_LIBRARY_PATH = "${S}/lib:${LD_LIBRARY_PATH}"
+LD_LIBRARY_PATH_prepend = "${S}/lib:"
+LD_LIBRARY_PATH[export] = "1"
 do_configure () {
 	./configure ${EXTRA_OECONF}
 }
diff --git a/compositeext/compositeext-cvs.oe b/compositeext/compositeext-cvs.oe
index 4efd297b34..f55abf598a 100644
--- a/compositeext/compositeext-cvs.oe
+++ b/compositeext/compositeext-cvs.oe
@@ -11,10 +11,9 @@ S = "${WORKDIR}/CompositeExt"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/damageext/damageext-cvs.oe b/damageext/damageext-cvs.oe
index 494406fcc3..9c58341e4b 100644
--- a/damageext/damageext-cvs.oe
+++ b/damageext/damageext-cvs.oe
@@ -11,10 +11,9 @@ S = "${WORKDIR}/DamageExt"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/docbook-utils/docbook-utils-native_0.6.13.oe b/docbook-utils/docbook-utils-native_0.6.13.oe
index a56e2650ef..0ec05ca4e1 100644
--- a/docbook-utils/docbook-utils-native_0.6.13.oe
+++ b/docbook-utils/docbook-utils-native_0.6.13.oe
@@ -17,7 +17,7 @@ do_stage () {
 		 backends/texi backends/txt frontends/docbook \
 		 helpers/docbook2man-spec.pl helpers/docbook2texi-spec.pl \
 		 docbook-utils.dsl; do
-		 install -d ${STAGING_DIR}/share/sgml/docbook/utils-${PV}/`dirname $i`
-		 install ${S}/$i ${STAGING_DIR}/share/sgml/docbook/utils-${PV}/$i
+		 install -d ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/`dirname $i`
+		 install ${S}/$i ${STAGING_DATADIR}/sgml/docbook/utils-${PV}/$i
 	done
 }
diff --git a/fixesext/fixesext-cvs.oe b/fixesext/fixesext-cvs.oe
index 01d566afc0..1c5e47f725 100644
--- a/fixesext/fixesext-cvs.oe
+++ b/fixesext/fixesext-cvs.oe
@@ -11,10 +11,9 @@ S = "${WORKDIR}/FixesExt"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
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/
 }
diff --git a/glibc/glibc_2.3.2.oe b/glibc/glibc_2.3.2.oe
index 0a573a2f5a..245bbce13a 100644
--- a/glibc/glibc_2.3.2.oe
+++ b/glibc/glibc_2.3.2.oe
@@ -149,7 +149,7 @@ do_compile_append() {
 }
 
 do_stage() {
-	oe_runmake 'install_root=${STAGING_DIR}/target' \
+	oe_runmake 'install_root=${STAGING_DIR}/${HOST_SYS}' \
 		   'includedir=/include' 'libdir=/lib' 'slibdir=/lib' \
 		   '${STAGING_LIBDIR}/libc-${PV}.so' '${STAGING_LIBDIR}/libc.so.6' \
 		   install-headers install-lib
diff --git a/gtk+/gtk+_2.2.4.oe b/gtk+/gtk+_2.2.4.oe
index 64bdd74082..e800257a17 100644
--- a/gtk+/gtk+_2.2.4.oe
+++ b/gtk+/gtk+_2.2.4.oe
@@ -65,7 +65,7 @@ do_stage () {
 	mkdir -p ${STAGING_LIBDIR}/gtk-2.0/include
 	install -m 0644 gdk/gdkconfig.h ${STAGING_LIBDIR}/gtk-2.0/include/gdkconfig.h
 
-	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DIR}/share/aclocal/
+	install -m 0644 m4macros/gtk-2.0.m4 ${STAGING_DATADIR}/aclocal/
 }
 
 python populate_packages_prepend () {
diff --git a/intltool/intltool-native_0.30.oe b/intltool/intltool-native_0.30.oe
index 109e488632..94fd370173 100644
--- a/intltool/intltool-native_0.30.oe
+++ b/intltool/intltool-native_0.30.oe
@@ -3,6 +3,6 @@ inherit native
 DEPENDS = ""
 
 do_stage () {
-	install -d ${STAGING_DIR}/share/aclocal
-	install -m 0644 intltool.m4 xml-i18n-tools.m4 ${STAGING_DIR}/share/aclocal/
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 intltool.m4 xml-i18n-tools.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/intltool/intltool_0.30.oe b/intltool/intltool_0.30.oe
index 04914d74d9..1f7b3298b7 100644
--- a/intltool/intltool_0.30.oe
+++ b/intltool/intltool_0.30.oe
@@ -9,5 +9,5 @@ S = "${WORKDIR}/intltool-${PV}"
 inherit autotools libtool pkgconfig
 
 do_stage() {
-	install -m 0644 intltool.m4 ${STAGING_DIR}/share/aclocal/
+	install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/korganizer/korganizer-embedded_1.5.0.oe b/korganizer/korganizer-embedded_1.5.0.oe
index fbd426e8ce..d6bf6cad5f 100644
--- a/korganizer/korganizer-embedded_1.5.0.oe
+++ b/korganizer/korganizer-embedded_1.5.0.oe
@@ -36,6 +36,6 @@ do_install() {
         oe_soinstall ${STAGING_LIBDIR}/${f} ${D}/opt/QtPalmtop/lib
         rm -f ${STAGING_LIBDIR}/${f}
     done
-    install -m 0755 ${STAGING_DIR}/target/bin/korganizer ${D}/opt/QtPalmtop/bin/korganizer
-    rm -f ${STAGING_DIR}/target/bin/korganizer
+    install -m 0755 ${STAGING_DIR}/${HOST_SYS}/bin/korganizer ${D}/opt/QtPalmtop/bin/korganizer
+    rm -f ${STAGING_DIR}/${HOST_SYS}/bin/korganizer
 }
diff --git a/libesmtp/libesmtp_1.0.1.oe b/libesmtp/libesmtp_1.0.1.oe
index c8d27adc33..7d8ca61692 100644
--- a/libesmtp/libesmtp_1.0.1.oe
+++ b/libesmtp/libesmtp_1.0.1.oe
@@ -17,7 +17,7 @@ do_stage () {
 	install -m 0644 .libs/libesmtp.lai ${STAGING_LIBDIR}/libesmtp.la
 	oe_soinstall .libs/libesmtp.so.5.1.2 ${STAGING_LIBDIR}/
 
-        install -d ${STAGING_DIR}/include
+        install -d ${STAGING_INCDIR}
 	install -m 644 auth-client.h ${STAGING_INCDIR}
 	install -m 644 auth-plugin.h ${STAGING_INCDIR}
 	install -m 644 libesmtp.h ${STAGING_INCDIR}
diff --git a/libtool/libtool-cross_1.5.oe b/libtool/libtool-cross_1.5.oe
index ef32aa112f..06ce17f27a 100644
--- a/libtool/libtool-cross_1.5.oe
+++ b/libtool/libtool-cross_1.5.oe
@@ -18,14 +18,14 @@ PACKAGES = ""
 
 do_stage () {
 	oe_runmake install
-	install -d ${STAGING_DIR}/share/{libtool,aclocal}
+	install -d ${STAGING_DATADIR}/{libtool,aclocal}
 	install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
 	install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
-	install -c config.guess ${STAGING_DIR}/share/libtool/config.guess
-	install -c config.sub ${STAGING_DIR}/share/libtool/config.sub
-	install -c -m 0644 ltmain.sh ${STAGING_DIR}/share/libtool/
-	install -c -m 0644 libtool.m4 ${STAGING_DIR}/share/aclocal/
-	install -c -m 0644 ltdl.m4 ${STAGING_DIR}/share/aclocal/
+	install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
+	install -c config.sub ${STAGING_DATADIR}/libtool/config.sub
+	install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
+	install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
+	install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
 
 	install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/
 	install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe
index ce694ac652..2e94d5c418 100644
--- a/libtool/libtool-native_1.5.oe
+++ b/libtool/libtool-native_1.5.oe
@@ -17,14 +17,14 @@ EXTRA_OECONF_append = " --program-prefix=${TARGET_SYS}-"
 
 do_stage () {
         oe_runmake install
-        install -d ${STAGING_DIR}/share/{libtool,aclocal}
+        install -d ${STAGING_DATADIR}/{libtool,aclocal}
         install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
         install -m 0755 libtoolize ${STAGING_BINDIR}/${HOST_SYS}-libtoolize
-        install -c config.guess ${STAGING_DIR}/share/libtool/config.guess
-        install -c config.sub ${STAGING_DIR}/share/libtool/config.sub
-        install -c -m 0644 ltmain.sh ${STAGING_DIR}/share/libtool/
-        install -c -m 0644 libtool.m4 ${STAGING_DIR}/share/aclocal/
-        install -c -m 0644 ltdl.m4 ${STAGING_DIR}/share/aclocal/
+        install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
+        install -c config.sub ${STAGING_DATADIR}/libtool/config.sub
+        install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
+        install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/
+        install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/
 
         install -m 0644 libltdl/.libs/libltdl.a ${STAGING_LIBDIR}/
         install -m 0644 libltdl/.libs/libltdl.lai ${STAGING_LIBDIR}/libltdl.la
diff --git a/libxine/libxine_1.0.0-beta12.oe b/libxine/libxine_1.0.0-beta12.oe
index e69de29bb2..97efec2c34 100644
--- a/libxine/libxine_1.0.0-beta12.oe
+++ b/libxine/libxine_1.0.0-beta12.oe
@@ -0,0 +1,69 @@
+DESCRIPTION = "libxine"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Pawel Osiczko <p.osiczko@tetrapyloctomy.org>"
+DEPENDS = "virtual/libc zlib libogg tremor libmad"
+RDEPENDS = "libc6 zlib libogg tremor libmad "
+
+inherit autotools
+
+S = "${WORKDIR}/xine-lib"
+
+SRC_URI = "cvs://anonymous@cvs.xine.sf.net/cvsroot/xine;module=xine-lib;tag=xine-1-beta12-release \
+	   file://${FILESDIR}/full.patch;patch=1 \
+	   file://${FILESDIR}/libvorbis.patch;patch=0 \
+	   file://${FILESDIR}/demux_ogg.patch;patch=0 \
+	   file://${FILESDIR}/configure.ac.patch;patch=0 \
+	   file://${FILESDIR}/vo_scale.patch;patch=0"
+
+SOV = "1.0.6"
+
+do_configure() {
+	./autogen.sh --host ${TARGET_SYS} --build ${BUILD_SYS} \
+	      --enable-shared --disable-static --prefix=${prefix} \
+	      --with-zlib-path=${STAGING_DIR}/${HOST_SYS} --with-vorbis-prefix=${STAGING_DIR}/${HOST_SYS} \
+	      --disable-oggtest --with-ogg-prefix=${STAGING_DIR}/${HOST_SYS} --without-x \
+	--disable-iconv --disable-nls --without-arts --without-sdl \
+	--disable-aalib
+}
+
+do_compile() {
+	oe_runmake LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool
+}
+
+# ug - we don't do elegant/purdy today
+do_install() {
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C src install-data \
+	  'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+	  'includedir=${D}/${includedir}'
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C include install-data \
+	  'prefix=${D}' 'exec_prefix=${D}' 'libdir=${D}/${libdir}' \
+	  'includedir=${D}/${includedir}'
+	install -m 0755 -d ${D}/${libdir}/xine/plugins/1.0.0
+	for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
+	  dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
+	  install -m 0755 $dso ${D}/${libdir}/xine/plugins/1.0.0
+	done
+	oe_soinstall src/xine-engine/.libs/libxine.so.${SOV} ${D}/${libdir}/
+}
+
+do_stage() {
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C src install-data \
+	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+	  'libdir=${STAGING_LIBDIR}' \
+	  'includedir=${STAGING_INCDIR}'
+	oe_runmake -e LIBTOOL=${STAGING_BINDIR}/arm-linux-libtool \
+	  -C include install-data \
+	  'prefix=${STAGING_DIR}' 'exec_prefix=${STAGING_DIR}' \
+	  'libdir=${STAGING_LIBDIR}' \
+	  'includedir=${STAGING_INCDIR}'
+	install -m 0755 -d ${STAGING_LIBDIR}/xine/plugins/1.0.0
+	for plugin in `find ${S}/src -type f -name xineplug*.la`; do 
+		dso=`dirname $plugin`/.libs/`basename $plugin .la`.so 
+		install -m 0755 $dso ${STAGING_LIBDIR}/xine/plugins/1.0.0
+	done
+	oe_soinstall src/xine-engine/.libs/libxine.so.${SOV} ${STAGING_LIBDIR}/
+}
diff --git a/pkgconfig/pkgconfig_0.15.0.oe b/pkgconfig/pkgconfig_0.15.0.oe
index 285ef71edc..b2ba4e5c40 100644
--- a/pkgconfig/pkgconfig_0.15.0.oe
+++ b/pkgconfig/pkgconfig_0.15.0.oe
@@ -16,6 +16,6 @@ do_configure_prepend () {
 }
 
 do_stage_append() {
-	install -d -m 0755 ${STAGING_DIR}/share/pkgconfig
+	install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
 
 }
diff --git a/python/python-native_2.3.3.oe b/python/python-native_2.3.3.oe
index e61a9a385b..5c7509aad0 100644
--- a/python/python-native_2.3.3.oe
+++ b/python/python-native_2.3.3.oe
@@ -11,7 +11,7 @@ S = "${WORKDIR}/Python-${PV}"
 
 inherit autotools native
 
-EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/build"
+EXTRA_OECONF = "--with-threads --with-pymalloc --with-cyclic-gc --with-prefix=${STAGING_DIR} --with-exec-prefix=${STAGING_DIR}/${BUILD_SYS}"
 
 do_configure () {
 	oe_runconf
@@ -19,6 +19,6 @@ do_configure () {
 
 do_stage_append() {
 	# install pgen for later usage with non-native builds
-	install Parser/pgen ${STAGING_DIR}/build/bin
+	install Parser/pgen ${STAGING_DIR}/${BUILD_SYS}/bin/
 }
 
diff --git a/randr/randr-cvs.oe b/randr/randr-cvs.oe
index 8d6bebe75b..301207165d 100644
--- a/randr/randr-cvs.oe
+++ b/randr/randr-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/Randr"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/recordext/recordext-cvs.oe b/recordext/recordext-cvs.oe
index e69de29bb2..0bdbaa399d 100644
--- a/recordext/recordext-cvs.oe
+++ b/recordext/recordext-cvs.oe
@@ -0,0 +1,18 @@
+PV = "0.0cvs${CVSDATE}"
+SECTION = "libs"
+MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+PROVIDES = "recordext"
+DESCRIPTION = "XRecord extension protocol bits"
+
+SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=RecordExt"
+S = "${WORKDIR}/RecordExt"
+
+inherit autotools pkgconfig
+
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
+}
diff --git a/render/render-cvs.oe b/render/render-cvs.oe
index 498dc40374..3322b7a56e 100644
--- a/render/render-cvs.oe
+++ b/render/render-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/Render"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/resourceext/resourceext-cvs.oe b/resourceext/resourceext-cvs.oe
index f6f2ac37ff..ac6c423208 100644
--- a/resourceext/resourceext-cvs.oe
+++ b/resourceext/resourceext-cvs.oe
@@ -11,10 +11,9 @@ S = "${WORKDIR}/ResourceExt"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/sgml-common/sgml-common-native_0.6.3.oe b/sgml-common/sgml-common-native_0.6.3.oe
index e25fb68e3b..1577ac90bb 100644
--- a/sgml-common/sgml-common-native_0.6.3.oe
+++ b/sgml-common/sgml-common-native_0.6.3.oe
@@ -11,14 +11,14 @@ do_stage () {
 	install -m 0755 bin/sgmlwhich ${STAGING_BINDIR}/
 	install -d ${STAGING_DIR}/etc
 	install -m 0644 config/sgml.conf ${STAGING_DIR}/etc/
-	install -d ${STAGING_DIR}/share/sgml
-	install -m 0644 xml.dcl ${STAGING_DIR}/share/sgml/
-	install -d ${STAGING_DIR}/share/xml/xml-iso-entities-8879.1986
-	install -m 0644 xml-iso-entities/catalog ${STAGING_DIR}/share/sgml/xml-iso-entities-8879.1986/
-	install -m 0644 xml-iso-entities/*.ent ${STAGING_DIR}/share/sgml/xml-iso-entities-8879.1986/
-	install -d ${STAGING_DIR}/share/sgml/sgml-iso-entities-8879.1986
-	install -m 0644 sgml-iso-entities/catalog ${STAGING_DIR}/share/sgml/sgml-iso-entities-8879.1986/
-	install -m 0644 sgml-iso-entities/*.ent ${STAGING_DIR}/share/sgml/sgml-iso-entities-8879.1986/
+	install -d ${STAGING_DATADIR}/sgml
+	install -m 0644 xml.dcl ${STAGING_DATADIR}/sgml/
+	install -d ${STAGING_DATADIR}/xml/xml-iso-entities-8879.1986
+	install -m 0644 xml-iso-entities/catalog ${STAGING_DATADIR}/sgml/xml-iso-entities-8879.1986/
+	install -m 0644 xml-iso-entities/*.ent ${STAGING_DATADIR}/sgml/xml-iso-entities-8879.1986/
+	install -d ${STAGING_DATADIR}/sgml/sgml-iso-entities-8879.1986
+	install -m 0644 sgml-iso-entities/catalog ${STAGING_DATADIR}/sgml/sgml-iso-entities-8879.1986/
+	install -m 0644 sgml-iso-entities/*.ent ${STAGING_DATADIR}/sgml/sgml-iso-entities-8879.1986/
 }
 
 do_install () {
diff --git a/tmake/tmake_1.11.oe b/tmake/tmake_1.11.oe
index 2d47c987aa..71aa13d49e 100644
--- a/tmake/tmake_1.11.oe
+++ b/tmake/tmake_1.11.oe
@@ -11,8 +11,8 @@ S = "${WORKDIR}/tmake-${PV}"
 do_stage() {
 	install -m 0755 bin/tmake bin/progen ${STAGING_BINDIR}/
 
-	install -d ${STAGING_DIR}/share/tmake
-	cp -R lib/* ${STAGING_DIR}/share/tmake/
+	install -d ${STAGING_DATADIR}/tmake
+	cp -R lib/* ${STAGING_DATADIR}/tmake/
 }
 
 do_install() {
diff --git a/tremor/tremor_20030325.oe b/tremor/tremor_20030325.oe
index 4aed815991..ce7bac0b24 100644
--- a/tremor/tremor_20030325.oe
+++ b/tremor/tremor_20030325.oe
@@ -18,10 +18,9 @@ do_configure_prepend() {
 }
 
 do_stage() {
-  oe_runmake install \
-    DESTDIR=${STAGING_DIR} \
-    includedir=/target/include/tremor \
-    libdir=/target/lib/tremor \
-    datadir=/share
-    prefix=''
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR}/tremor \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xau/xau-cvs.oe b/xau/xau-cvs.oe
index 513b2fa50a..a5185932ba 100644
--- a/xau/xau-cvs.oe
+++ b/xau/xau-cvs.oe
@@ -12,6 +12,10 @@ S = "${WORKDIR}/Xau"
 
 inherit autotools pkgconfig libtool
 
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xcomposite/xcomposite-cvs.oe b/xcomposite/xcomposite-cvs.oe
index 860cd3bab1..21b73588f6 100644
--- a/xcomposite/xcomposite-cvs.oe
+++ b/xcomposite/xcomposite-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/Xcomposite"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xdamage/xdamage-cvs.oe b/xdamage/xdamage-cvs.oe
index 9d1ce9504f..83ef74026d 100644
--- a/xdamage/xdamage-cvs.oe
+++ b/xdamage/xdamage-cvs.oe
@@ -12,10 +12,9 @@ S = "${WORKDIR}/Xdamage"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xdmcp/xdmcp-cvs.oe b/xdmcp/xdmcp-cvs.oe
index 0b11393ef8..300029bf34 100644
--- a/xdmcp/xdmcp-cvs.oe
+++ b/xdmcp/xdmcp-cvs.oe
@@ -13,10 +13,9 @@ S = "${WORKDIR}/Xdmcp"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xext/xext-cvs.oe b/xext/xext-cvs.oe
index 7142a9ed2c..2033236078 100644
--- a/xext/xext-cvs.oe
+++ b/xext/xext-cvs.oe
@@ -11,10 +11,9 @@ S = "${WORKDIR}/Xext"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xextensions/xextensions-cvs.oe b/xextensions/xextensions-cvs.oe
index db6495c6c2..2c29514cb0 100644
--- a/xextensions/xextensions-cvs.oe
+++ b/xextensions/xextensions-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/XExtensions"
 inherit autotools pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xfixes/xfixes-cvs.oe b/xfixes/xfixes-cvs.oe
index 998732063b..4f7821a6cb 100644
--- a/xfixes/xfixes-cvs.oe
+++ b/xfixes/xfixes-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/Xfixes"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xfont/xfont-cvs.oe b/xfont/xfont-cvs.oe
index 459b33893c..7410ea819c 100644
--- a/xfont/xfont-cvs.oe
+++ b/xfont/xfont-cvs.oe
@@ -13,10 +13,9 @@ S = "${WORKDIR}/Xfont"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xft/xft-cvs.oe b/xft/xft-cvs.oe
index 3d9e5ecff2..45d39fd149 100644
--- a/xft/xft-cvs.oe
+++ b/xft/xft-cvs.oe
@@ -15,12 +15,11 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
 
 python do_package() {
diff --git a/xi/xi-cvs.oe b/xi/xi-cvs.oe
index e9fb43a477..206c623394 100644
--- a/xi/xi-cvs.oe
+++ b/xi/xi-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/Xi"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xproto/xproto-cvs.oe b/xproto/xproto-cvs.oe
index 000dad5a95..a14254c8ef 100644
--- a/xproto/xproto-cvs.oe
+++ b/xproto/xproto-cvs.oe
@@ -11,6 +11,9 @@ inherit autotools pkgconfig
 
 
 do_stage() {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
-
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xrandr/xrandr-cvs.oe b/xrandr/xrandr-cvs.oe
index e41021db4b..8d6056afe0 100644
--- a/xrandr/xrandr-cvs.oe
+++ b/xrandr/xrandr-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/Xrandr"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xrender/xrender-cvs.oe b/xrender/xrender-cvs.oe
index 097343e534..fa37019f1c 100644
--- a/xrender/xrender-cvs.oe
+++ b/xrender/xrender-cvs.oe
@@ -10,10 +10,9 @@ S = "${WORKDIR}/Xrender"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xres/xres-cvs.oe b/xres/xres-cvs.oe
index a109785bd5..b1591ceb95 100644
--- a/xres/xres-cvs.oe
+++ b/xres/xres-cvs.oe
@@ -11,10 +11,9 @@ S = "${WORKDIR}/XRes"
 inherit autotools pkgconfig libtool
 
 do_stage() {
-	oe_runmake install DESTDIR=${STAGING_DIR} \
-	       bindir=/build/bin \
-	       includedir=/target/include \
-	       libdir=/target/lib \
-	       datadir=/share
-	       prefix=
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
diff --git a/xtrans/xtrans-cvs.oe b/xtrans/xtrans-cvs.oe
index 7674ea1dd6..c7de342e72 100644
--- a/xtrans/xtrans-cvs.oe
+++ b/xtrans/xtrans-cvs.oe
@@ -12,6 +12,9 @@ S = "${WORKDIR}/xtrans"
 inherit autotools libtool pkgconfig
 
 do_stage() {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
-
diff --git a/xtst/xtst-cvs.oe b/xtst/xtst-cvs.oe
index 531a6fd73a..efb43dcbd4 100644
--- a/xtst/xtst-cvs.oe
+++ b/xtst/xtst-cvs.oe
@@ -12,6 +12,10 @@ S = "${WORKDIR}/Xtst"
 
 inherit autotools pkgconfig libtool
 
-do_stage () {
-	oe_runmake install DESTDIR="" bindir=${STAGING_BINDIR} includedir=${STAGING_INCDIR} libdir=${STAGING_LIBDIR} prefix=${STAGING_DIR}
+do_stage() {
+	oe_runmake install prefix=${STAGING_DIR} \
+	       bindir=${STAGING_BINDIR} \
+	       includedir=${STAGING_INCDIR} \
+	       libdir=${STAGING_LIBDIR} \
+	       datadir=${STAGING_DATADIR}
 }
author	Chris Larson <clarson@kergoth.com>	2004-04-01 17:57:34 +0000
committer	Chris Larson <clarson@kergoth.com>	2004-04-01 17:57:34 +0000
commit	7d0f4d1ff2349647def5f78e6f07d4ce0bc7fffc (patch)
tree	0e273dc0c82ac47904f723db0eaaa44679f0df66
parent	0851f86cd64bd723f578846da6676c8782ac65d7 (diff)