pandora-pndstore: Fixed recipe

diff --git a/recipes/pandora-system/pandora-pndstore.bb b/recipes/pandora-system/pandora-pndstore.bb
index 1786b14..068ba69 100755 (executable)
--- a/recipes/pandora-system/pandora-pndstore.bb
+++ b/recipes/pandora-system/pandora-pndstore.bb
@@ -14,15 +14,31 @@ SRCREV = "8bbc5ef07280e2e26e11"
 S = "${WORKDIR}/git"
 
 do_install() {
-
-      python setup.py install --root=${D}
-
-      # A stop-gap fix to the ctypes bug.
-      # This can be removed once the python-ctypes package is made to behave correctly.
-      install -m 0644 ${WORKDIR}/_ctypes.so ${D}/usr/lib/python2.6/lib-dynload/_ctypes.so
-        
-      install -Dm 0644 ${WORKDIR}/op_pndstore.desktop ${D}${datadir}/applications/op_pndstore.desktop 
-      install -Dm 0644 ${S}/resources/icon.png ${D}${datadir}/pixmaps/op_pndstore.png
+          install -d ${D}${prefix}/pandora/scripts/pndstore/
+          install -m 0775 ${S}/PNDstore ${D}${prefix}/pandora/scripts/pndstore/PNDstore
+         install -m 0775 ${S}/pndst ${D}${prefix}/pandora/scripts/pndstore/pndst
+         install -m 0644 ${S}/README.rst ${D}${prefix}/pandora/scripts/pndstore/README.rst
+         install -m 0644 ${WORKDIR}/_ctypes.so ${D}/usr/lib/python2.6/lib-dynload/_ctypes.so
+
+         install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui 
+         install -m 0775 ${S}/pndstore_gui/PNDstore.glade ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui/PNDstore.glade
+         install -m 0775 ${S}/pndstore_gui/__init__.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_gui/__init__.py
+           
+         install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_core
+         install -m 0775 ${S}/pndstore_core/__init__.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/__init__.py
+         install -m 0775 ${S}/pndstore_core/database_update.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/database_update.py
+         install -m 0775 ${S}/pndstore_core/libpnd.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/libpnd.py
+         install -m 0775 ${S}/pndstore_core/options.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/options.py
+         install -m 0775 ${S}/pndstore_core/packages.py ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/packages.py
+
+         install -d ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/cfg
+         install -m 0775 ${S}/pndstore_core/cfg/default.cfg ${D}${prefix}/pandora/scripts/pndstore/pndstore_core/cfg/default.cfg
+
+         install -d ${D}${datadir}/applications/
+          install -m 0644 ${WORKDIR}/op_pndstore.desktop ${D}${datadir}/applications/
+
+         install -d ${D}${datadir}/pixmaps/
+         install -m 0644 ${S}/resources/icon.png ${D}${datadir}/pixmaps/op_pndstore.png
 
 }
 

diff --git a/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop b/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
index d943b73..f27b22d 100644 (file)
--- a/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
+++ b/recipes/pandora-system/pandora-pndstore/op_pndstore.desktop
@@ -2,7 +2,7 @@
 Name=PNDstore
 Comment=Download and update software for your Pandora.
 StartupNotify=false
-Exec=python /usr/bin/PNDstore
+Exec=python /usr/pandora/scripts/pndstore/PNDstore
 Icon=/usr/share/pixmaps/op_pndstore.png
 Terminal=false
 Type=Application