Change db to 4.1.25, update PR's across the board

git-svn-id: https://svn.o-hand.com/repos/poky@89 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 7 insertions, 4 deletions

diff --git a/openembedded/packages/db/db_4.3.27.bb b/openembedded/packages/db/db_4.1.25.bb
index 518fddee9f..168dde478d 100644
--- a/openembedded/packages/db/db_4.3.27.bb
+++ b/openembedded/packages/db/db_4.1.25.bb
@@ -73,17 +73,20 @@ do_stage() {
         # Install, for the moment, into include/db4 to avoid
         # interfering with the db3 headers (which have the same
         # name).  -I${STAGING_INCDIR}/db4 to use db4, as opposed
-        # to db3.
+        # to db3
+        
         rm -rf ${STAGE_TEMP}
         mkdir -p ${STAGE_TEMP}
-        oe_runmake DESTDIR="${STAGE_TEMP}" install_include
+        oe_runmake DESTDIR="${STAGE_TEMP}" includedir="${STAGE_TEMP}${includedir}" install_include
         mkdir -p ${STAGING_INCDIR}/db4
         cp -pPRf ${STAGE_TEMP}/${includedir}/* ${STAGING_INCDIR}/db4
         rm -rf ${STAGE_TEMP}
-        oe_libinstall -so -C .libs libdb-4.3 ${STAGING_LIBDIR}
+        oe_libinstall -so -C .libs libdb-4.1 ${STAGING_LIBDIR}
 }
 
-do_install_append() {
+do_install() {
+        oe_runmake includedir="${D}${includedir}" libdir="${D}${libdir}" bindir="${D}${bindir}" docdir="${D}${docdir}" install
+
         # The docs end up in /usr/docs - not right.
         if test -d "${D}/${prefix}/docs"
         then