Merge bk://oe-devel@oe-devel.bkbits.net/packages

into stealth.nexus.co.uk:/home/pb/oe/oe-packages

2004/12/01 10:34:19+00:00 nexus.co.uk!pb
correct installation of sqlite headers; patch from Florian Boor

BKrev: 41ada725jrU4meZM-eCcGWWFtE7LLg

diff --git a/sqlite/sqlite_2.8.15.oe b/sqlite/sqlite_2.8.15.oe
index 2579260..dcf686c 100644 (file)
--- a/sqlite/sqlite_2.8.15.oe
+++ b/sqlite/sqlite_2.8.15.oe
@@ -4,7 +4,7 @@ SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS = "readline ncurses"
 LICENSE = "PD"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.hwaci.com/sw/sqlite/sqlite-${PV}.tar.gz \
           file://main.mk"
@@ -36,7 +36,7 @@ do_stage() {
         ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so
         ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0
         ln -sf libsqlite.so.0.8.6 ${STAGING_LIBDIR}/libsqlite.so.0.8
-       install -m 0644 sqlite.h ${STAGING_INCDIR}
+        install -m 0644 sqlite.h ${STAGING_INCDIR}
 }
 
 do_install() {
@@ -46,6 +46,8 @@ do_install() {
        ln -sf libsqlite.so.0.8.6 ${D}/${libdir}/libsqlite.so
         ln -sf libsqlite.so.0.8.6 ${D}/${libdir}/libsqlite.so.0
         ln -sf libsqlite.so.0.8.6 ${D}/${libdir}/libsqlite.so.0.8
+        install -d ${D}/${includedir}
+        install -m 0644 sqlite.h ${D}/${includedir}/sqlite.h
 }
 
 PACKAGES += "${PN}-bin"