task-pandora-*: Commit latest Xfce and Core tasks to build PAM correctly and package...

[openpandora.oe.git] / recipes / pandora-system / pandora-libpnd.bb

diff --git a/recipes/pandora-system/pandora-libpnd.bb b/recipes/pandora-system/pandora-libpnd.bb
index ef0976d..d3f352c 100755 (executable)
--- a/recipes/pandora-system/pandora-libpnd.bb
+++ b/recipes/pandora-system/pandora-libpnd.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Support for the PND format in Pandora images (lib, daemon, init script etc.)"
 LICENSE = "lGPL"
 
-PR = "r1.7"
+PR = "r4"
 
 PARALLEL_MAKE = ""
 
@@ -10,7 +10,7 @@ SRC_URI = " \
           file://rc.libpnd \
 "
 
-SRCREV = "b2d3c0871614632279192ef86e5affd75312f01b"
+SRCREV = "fd9090900d653b51b1d7b335b1224c3b65353773"
 
 S = "${WORKDIR}/git"
 
@@ -26,8 +26,6 @@ do_compile_prepend() {
           cd ${S}/
 }
 
-#EXTRA_OEMAKE = "all"
-
 do_compile() {
           oe_runmake 
           oe_runmake deploy
@@ -39,25 +37,25 @@ do_install() {
           install ${S}/deployment/etc/pandora/conf/desktop ${D}${sysconfdir}/pandora/conf/desktop
 
           install -d ${D}${libdir}/
-          cp -pP ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1.0.1
-          cp -pP ${S}/deployment/usr/lib/libpnd.a ${D}${libdir}/libpnd.a
+          cp -pP ${S}/deployment/usr/lib/libpnd* ${D}${libdir}/
+#          cp -pP ${S}/deployment/usr/lib/libpnd.so.1.0.1 ${D}${libdir}/libpnd.so.1
+#          cp -pP ${S}/deployment/usr/lib/libpnd.a ${D}${libdir}/libpnd.a
           
           install -d ${D}${bindir}/
           cp -pP ${S}/deployment/usr/bin/pndnotifyd ${D}${bindir}/pndnotifyd
                    
           install -d ${D}${prefix}/pandora/
           install -d ${D}${prefix}/pandora/apps/
-          cp -pP ${S}/deployment/usr/pandora/apps/.* ${D}${prefix}/pandora/apps/
+#          cp -pP ${S}/deployment/usr/pandora/apps/* ${D}${prefix}/pandora/apps
           install -d ${D}${prefix}/pandora/scripts/
-          cp -pP ${S}/deployment/usr/pandora/scripts/*.* ${D}${prefix}/pandora/scripts/
+          cp -pP ${S}/deployment/usr/pandora/scripts/* ${D}${prefix}/pandora/scripts
           
           install -d ${D}${sysconfdir}/init.d/
           cp -pP ${WORKDIR}/rc.libpnd ${D}${sysconfdir}/init.d/libpnd-init
+          
+          install -d ${D}/home/root/
+          install -d ${D}${prefix}/local/share/applications/
 }
 
-pkg_postinst() {
-#!/bin/sh
-ln -sf /usr/lib/libpnd.so.1.0.1 /usr/lib/libpnd.so.1 
-}
-
-FILES_${PN} += "${bindir} ${sbindir}"
+FILES_${PN} += "${bindir} ${sbindir} ${prefix}/pandora/*"
+FILES_${PN}-dev += "${libdir}/libpnd.a"