summaryrefslogtreecommitdiff
path: root/packages/kdepimpi
diff options
context:
space:
mode:
authorMichael Krelin <hacker@klever.net>2007-07-07 21:08:57 +0000
committerMichael Krelin <hacker@klever.net>2007-07-07 21:08:57 +0000
commitb71a105e98ae8362b7c153ee30adaa5df82f87cd (patch)
tree7561825e47a380f21423856742a007eac31aae2f /packages/kdepimpi
parentf057cb4c3703dcf67876320fce5b0421c913b359 (diff)
kdepimpi: install binaries into ${bindir} instead of ${palmtopdir}/bin
Diffstat (limited to 'packages/kdepimpi')
-rw-r--r--packages/kdepimpi/kdepimpi-base.inc18
-rw-r--r--packages/kdepimpi/kdepimpi_2.2.7.bb2
2 files changed, 10 insertions, 10 deletions
diff --git a/packages/kdepimpi/kdepimpi-base.inc b/packages/kdepimpi/kdepimpi-base.inc
index cb845397bd..5a50be3de7 100644
--- a/packages/kdepimpi/kdepimpi-base.inc
+++ b/packages/kdepimpi/kdepimpi-base.inc
@@ -110,7 +110,7 @@ do_stage() {
}
do_install() {
- install -d ${D}${palmtopdir}/bin \
+ install -d ${D}${bindir} \
${D}${palmtopdir}/lib \
${D}${palmtopdir}/apps/1Pim \
${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \
@@ -136,10 +136,10 @@ do_install() {
oe_libinstall -so -C ${S}/dest/ $f ${D}${palmtopdir}/lib
done
- install -m 0755 ${S}/dest/kopi ${D}${palmtopdir}/bin/kopi
- install -m 0755 ${S}/dest/kapi ${D}${palmtopdir}/bin/kapi
+ install -m 0755 ${S}/dest/kopi ${D}${bindir}/kopi
+ install -m 0755 ${S}/dest/kapi ${D}${bindir}/kapi
- install -d ${D}${bindir} ${D}${libdir}
+ install -d ${D}${libdir}
install -m 0755 ${S}/dest/kammu ${D}${bindir}/kammu
oe_libinstall -so -C ${S}/dest/ libmicrokammu ${D}${libdir}
@@ -152,11 +152,11 @@ do_install() {
PACKAGES = "libmicrokcal libmicrokabc kopi-applet kopi kapi libmicrokdelibs kammu libmicrokammu"
-FILES_kopi = "${palmtopdir}/bin/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* "
-FILES_kapi = "${palmtopdir}/bin/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
+FILES_kopi = "${bindir}/kopi ${palmtopdir}/apps/1Pim/korganizer.desktop ${palmtopdir}/pics/kdepim/korganizer/* "
+FILES_kapi = "${bindir}/kapi ${palmtopdir}/apps/1Pim/kaddressbook.desktop ${palmtopdir}/pics/kdepim/kaddressbook/* ${palmtopdir}/lib/libmicrokabc_* ${palmtopdir}/lib/libmicrokabcformat_binary*"
FILES_kopi-applet = "${palmtopdir}/plugins/applets/* ${palmtopdir}/pics/ko16.png ${palmtopdir}/pics/ko24.png"
-FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc*"
-FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal*"
-FILES_libmicrokdelibs = "${palmtopdir}/lib/*"
+FILES_libmicrokabc = "${palmtopdir}/lib/libmicrokabc.so.*"
+FILES_libmicrokcal = "${palmtopdir}/lib/libmicrokcal.so.*"
+FILES_libmicrokdelibs = "${palmtopdir}/lib/*.so.*"
FILES_kammu = "${bindir}/kammu"
FILES_libmicrokammu = "${libdir}/libmicrokammu*"
diff --git a/packages/kdepimpi/kdepimpi_2.2.7.bb b/packages/kdepimpi/kdepimpi_2.2.7.bb
index ca4d5c0786..7252d0a6f1 100644
--- a/packages/kdepimpi/kdepimpi_2.2.7.bb
+++ b/packages/kdepimpi/kdepimpi_2.2.7.bb
@@ -4,4 +4,4 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
require kdepimpi-base.inc
-PR = "r1"
+PR = "r2"