moved sword includes to sword/ directory

BKrev: 41586754yF3lmS1BVqwkWwjCjNZgzg

diff --git a/opie-dagger/opie-dagger_cvs.oe b/opie-dagger/opie-dagger_cvs.oe
index 96c8530..4d93c0d 100644 (file)
--- a/opie-dagger/opie-dagger_cvs.oe
+++ b/opie-dagger/opie-dagger_cvs.oe
@@ -6,6 +6,7 @@ LICENSE = "GPL"
 DEPENDS = "libopiecore2 libopieui2 sword"
 PV = "1.1.6-cvs-${CVSDATE}"
 APPNAME = "dagger"
+PR = "r1"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/dagger \
            cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/pics \
@@ -13,6 +14,9 @@ SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/noncore/apps/
 
 S = "${WORKDIR}/${APPNAME}"
 
+EXTRA_QMAKEVARS_POST="INCLUDEPATH+=${STAGING_INCDIR}/sword/"
+
+
 inherit opie
 
 # FILES plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop

diff --git a/sword/sword_1.5.7.oe b/sword/sword_1.5.7.oe
index 441e946..21a53cb 100644 (file)
--- a/sword/sword_1.5.7.oe
+++ b/sword/sword_1.5.7.oe
@@ -2,7 +2,7 @@ DESCRIPTION = "The SWORD Project is an open source, cross-platform (Linux, Windo
 Bible software with a constantly growing list of front-ends (GUI, textmode, web-based, etc.) and a library of over 200 text modules"
 SECTION = "libs"
 PRIORITY = "optional"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.crosswire.org/~dglassey/sword-1.5.7a.tar.gz"
 
@@ -13,10 +13,10 @@ EXTRA_OECONF = "--without-clucene --without-curl"
 do_stage() {
        oe_libinstall -so -C lib libsword ${STAGING_LIBDIR}
 
-       install -d ${STAGING_INCDIR}/
+       install -d ${STAGING_INCDIR}/sword/
        for f in include/*.h
        do
-               install -m 0644 $f ${STAGING_INCDIR}/
+               install -m 0644 $f ${STAGING_INCDIR}/sword/
        done
 
 }