explicit_merge of '662a617882f791ea9f9ca8aa0bd50f264d6c1db7'

              and '00f00d3a48aefe68a725e5e07c63fd5910f1b995'
   using ancestor ''
        to branch 'org.openembedded.dev'

7 files changed, 41 insertions, 61 deletions

diff --git a/packages/bluez/bluez-libs_2.21.bb b/packages/bluez/bluez-libs_2.21.bb
index d740bd80a9..e5ef923d03 100644
--- a/packages/bluez/bluez-libs_2.21.bb
+++ b/packages/bluez/bluez-libs_2.21.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.bluez.org"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz"
 
@@ -12,11 +12,5 @@ inherit autotools pkgconfig
 HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h"
 
 do_stage() {
-        oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR}
-
-        install -d ${STAGING_INCDIR}/bluetooth/
-        for f in ${HEADERS}
-        do
-		install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f
-        done
+	autotools_stage_all
 }
diff --git a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
index 90c44c912f..ba6dc65f88 100644
--- a/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
+++ b/packages/cyrus-sasl/cyrus-sasl_2.1.19.bb
@@ -2,7 +2,7 @@ SECTION = "console/network"
 DEPENDS = "openssl virtual/db"
 DESCRIPTION = "Generic client/server library for SASL authentication."
 LICENSE = "BSD"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${PV}.tar.gz \
 	   file://berkdb.m4.patch;patch=1"
@@ -33,16 +33,7 @@ do_compile_prepend () {
 }
 
 do_stage () {
-	oe_libinstall -so -a -C lib libsasl2 ${STAGING_LIBDIR}
-	install -d ${STAGING_LIBDIR}/sasl2
-	install -d ${STAGING_INCDIR}/sasl
-	install -m 0644 ${S}/include/hmac-md5.h ${STAGING_INCDIR}/sasl/
-	install -m 0644 ${S}/include/md5.h ${STAGING_INCDIR}/sasl/
-	install -m 0644 ${S}/include/md5global.h ${STAGING_INCDIR}/sasl/
-	install -m 0644 ${S}/include/sasl.h ${STAGING_INCDIR}/sasl/
-	install -m 0644 ${S}/include/saslplug.h ${STAGING_INCDIR}/sasl/
-	install -m 0644 ${S}/include/saslutil.h ${STAGING_INCDIR}/sasl/
-	install -m 0644 ${S}/include/prop.h ${STAGING_INCDIR}/sasl/
+	autotools_stage_all
 }
 
 pkg_postinst () {
diff --git a/packages/glib-2.0/glib-2.0-native_2.6.5.bb b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
index 6615fc39c5..6524bf2ecd 100644
--- a/packages/glib-2.0/glib-2.0-native_2.6.5.bb
+++ b/packages/glib-2.0/glib-2.0-native_2.6.5.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS = "gtk-doc-native"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF = "--disable-debug"
 
@@ -26,22 +26,11 @@ do_configure_prepend () {
 }
 
 do_stage () {
+	autotools_stage_all
 	install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
 	install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
 	install -m 0755 glib-gettextize ${STAGING_BINDIR}/
-	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
-	install -d ${STAGING_INCDIR}/glib-2.0/glib
 	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
-	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
-	install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
-	install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
-	install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
 }
 
 do_install () {
diff --git a/packages/glib-2.0/glib-2.0_2.8.2.bb b/packages/glib-2.0/glib-2.0_2.8.2.bb
index d377a0aeae..406f9d8981 100644
--- a/packages/glib-2.0/glib-2.0_2.8.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.2.bb
@@ -10,7 +10,7 @@ MAINTAINER = "Philip Blundell <pb@handhelds.org>"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-PR = "r0"
+PR = "r1"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
@@ -35,14 +35,6 @@ do_configure_prepend () {
 }
 
 do_stage () {
-	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
-	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	autotools_stage_all
 	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
-	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
 }
diff --git a/packages/jpeg/jpeg-6b/install.patch b/packages/jpeg/jpeg-6b/install.patch
new file mode 100644
index 0000000000..742594a11f
--- /dev/null
+++ b/packages/jpeg/jpeg-6b/install.patch
@@ -0,0 +1,28 @@
+--- jpeg-6b/makefile.cfg.orig	2005-12-29 12:51:05.584736333 -0800
++++ jpeg-6b/makefile.cfg	2005-12-29 12:55:05.075806556 -0800
+@@ -192,11 +192,13 @@ wrjpgcom: wrjpgcom.$(O)
+ # Installation rules:
+ 
+ install: cjpeg djpeg jpegtran rdjpgcom wrjpgcom @FORCE_INSTALL_LIB@
++	$(INSTALL) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) cjpeg $(DESTDIR)$(bindir)/$(binprefix)cjpeg
+ 	$(INSTALL_PROGRAM) djpeg $(DESTDIR)$(bindir)/$(binprefix)djpeg
+ 	$(INSTALL_PROGRAM) jpegtran $(DESTDIR)$(bindir)/$(binprefix)jpegtran
+ 	$(INSTALL_PROGRAM) rdjpgcom $(DESTDIR)$(bindir)/$(binprefix)rdjpgcom
+ 	$(INSTALL_PROGRAM) wrjpgcom $(DESTDIR)$(bindir)/$(binprefix)wrjpgcom
++	$(INSTALL) -d $(DESTDIR)$(mandir)
+ 	$(INSTALL_DATA) $(srcdir)/cjpeg.1 $(DESTDIR)$(mandir)/$(manprefix)cjpeg.$(manext)
+ 	$(INSTALL_DATA) $(srcdir)/djpeg.1 $(DESTDIR)$(mandir)/$(manprefix)djpeg.$(manext)
+ 	$(INSTALL_DATA) $(srcdir)/jpegtran.1 $(DESTDIR)$(mandir)/$(manprefix)jpegtran.$(manext)
+@@ -204,9 +206,11 @@ install: cjpeg djpeg jpegtran rdjpgcom w
+ 	$(INSTALL_DATA) $(srcdir)/wrjpgcom.1 $(DESTDIR)$(mandir)/$(manprefix)wrjpgcom.$(manext)
+ 
+ install-lib: libjpeg.$(A) install-headers
++	$(INSTALL) -d $(DESTDIR)$(libdir)
+ 	$(INSTALL_LIB) libjpeg.$(A) $(DESTDIR)$(libdir)/$(binprefix)libjpeg.$(A)
+ 
+ install-headers: jconfig.h
++	$(INSTALL) -d $(DESTDIR)$(includedir)
+ 	$(INSTALL_DATA) jconfig.h $(DESTDIR)$(includedir)/jconfig.h
+ 	$(INSTALL_DATA) $(srcdir)/jpeglib.h $(DESTDIR)$(includedir)/jpeglib.h
+ 	$(INSTALL_DATA) $(srcdir)/jmorecfg.h $(DESTDIR)$(includedir)/jmorecfg.h
diff --git a/packages/jpeg/jpeg-native_6b.bb b/packages/jpeg/jpeg-native_6b.bb
index b617f1b6c0..420cc9fd4b 100644
--- a/packages/jpeg/jpeg-native_6b.bb
+++ b/packages/jpeg/jpeg-native_6b.bb
@@ -5,10 +5,5 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/jpeg-${PV}"
 DEPENDS = ""
 
 do_stage() {
-        install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h
-        install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h
-        install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h
-        install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h
-        install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h
-        oe_libinstall -so libjpeg ${STAGING_LIBDIR}
+	autotools_stage_all
 }
diff --git a/packages/jpeg/jpeg_6b.bb b/packages/jpeg/jpeg_6b.bb
index 49e0382b6e..277cdfa48c 100644
--- a/packages/jpeg/jpeg_6b.bb
+++ b/packages/jpeg/jpeg_6b.bb
@@ -1,3 +1,4 @@
+PR = "r1"
 SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
@@ -9,7 +10,8 @@ LICENSE ="jpeg"
 SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	   file://debian.patch;patch=1 \
 	   file://ldflags.patch;patch=1 \
-	   file://paths.patch;patch=1"
+	   file://paths.patch;patch=1 \
+	   file://install.patch;patch=1"
 S = "${WORKDIR}/jpeg-${PV}"
 
 inherit autotools 
@@ -20,16 +22,5 @@ EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"'
 CFLAGS_append = " -D_REENTRANT"
 
 do_stage() {
-	install -m 644 jconfig.h ${STAGING_INCDIR}/jconfig.h
-	install -m 644 jpeglib.h ${STAGING_INCDIR}/jpeglib.h
-	install -m 644 jmorecfg.h ${STAGING_INCDIR}/jmorecfg.h
-	install -m 644 jerror.h ${STAGING_INCDIR}/jerror.h
-	install -m 644 jpegint.h ${STAGING_INCDIR}/jpegint.h
-	oe_libinstall -so libjpeg ${STAGING_LIBDIR}
-}
-
-do_install() {
-	install -d ${D}${bindir} ${D}${includedir} \
-		   ${D}${mandir}/man1 ${D}${libdir}
-	oe_runmake 'DESTDIR=${D}' install
+	autotools_stage_all
 }