opie-icon-reload: adjust to the new filesystem layout

diff --git a/packages/opie-icon-reload/opie-icon-reload.inc b/packages/opie-icon-reload/opie-icon-reload.inc
index 131f2cc..a83aa34 100644 (file)
--- a/packages/opie-icon-reload/opie-icon-reload.inc
+++ b/packages/opie-icon-reload/opie-icon-reload.inc
@@ -13,11 +13,12 @@ FILES_${PN} += "${palmtopdir}"
 
 do_install() {         
        install -d ${D}${palmtopdir}/apps/Settings
-       install -d ${D}${palmtopdir}/bin
+       install -d ${D}${bindir}
        install -d ${D}${palmtopdir}/pics
        
        install -m 0644 ${WORKDIR}/icon-reload.desktop ${D}${palmtopdir}/apps/Settings
-       install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${palmtopdir}/bin
+       install -m 0755 ${WORKDIR}/icon-reload.sh ${D}${bindir}
+       sed -i -e 's,@bindir@,${bindir},g' ${D}${bindir}/icon-reload.sh
        install -m 0644 ${WORKDIR}/reload.png ${D}${palmtopdir}/pics    
 }
 

diff --git a/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh b/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh
index 3df151c..adeba39 100755 (executable)
--- a/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh
+++ b/packages/opie-icon-reload/opie-icon-reload/icon-reload.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadInputMethods()"                                            
-/opt/QtPalmtop/bin/qcop QPE/System "linkChanged(QString)" 
+@bindir@/qcop QPE/TaskBar "reloadInputMethods()"                                            
+@bindir@/qcop QPE/System "linkChanged(QString)" 

diff --git a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
index a4897d0..13a5942 100644 (file)
--- a/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
+++ b/packages/opie-icon-reload/opie-icon-reload_1.2.2.bb
@@ -1,3 +1,3 @@
 require ${PN}.inc
 
-PR = "r1"
+PR = "r2"