[oe-commits] org.oe.dev kdepimpi: install binaries into ${bindir} instead of ${palmtopdir}/bin

[polyonymous commit]

kdepimpi: install binaries into ${bindir} instead of ${palmtopdir}/bin

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: b9a7c56e538922d7df3ae79122857e26dad8346a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b9a7c56e538922d7df3ae79122857e26dad8346a
Files:
1
packages/kdepimpi/kdepimpi-base.inc
packages/kdepimpi/kdepimpi_2.2.7.bb
Diffs:

#
# mt diff -rb83fe9234e3fdf9b46345130e037c3be17162330 -rb9a7c56e538922d7df3ae79122857e26dad8346a
#
# 
# 
# patch "packages/kdepimpi/kdepimpi-base.inc"
#  from [a7b42f098bd064fabb4acf4a0d6adaadf317e6c1]
#    to [ede0b8f85fda46ba2efefb1270028763c8537951]
# 
# patch "packages/kdepimpi/kdepimpi_2.2.7.bb"
#  from [1812ef579a9511787f6477d94f929712b573e766]
#    to [0349a4cb14b6823831790a11e39cfeff149c58a3]
# 
============================================================
--- packages/kdepimpi/kdepimpi-base.inc	a7b42f098bd064fabb4acf4a0d6adaadf317e6c1
+++ packages/kdepimpi/kdepimpi-base.inc	ede0b8f85fda46ba2efefb1270028763c8537951
@@ -110,7 +110,7 @@ do_install() {
 }
 
 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 @@ PACKAGES = "libmicrokcal libmicrokabc ko
 
 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*"
============================================================
--- packages/kdepimpi/kdepimpi_2.2.7.bb	1812ef579a9511787f6477d94f929712b573e766
+++ packages/kdepimpi/kdepimpi_2.2.7.bb	0349a4cb14b6823831790a11e39cfeff149c58a3
@@ -1,7 +1,7 @@ require kdepimpi-base.inc
 SRC_URI = "${SOURCEFORGE_MIRROR}/kdepimpi/kdepimpi-${PV}.tar.gz \
            file://gcc4.patch;patch=1 \
 	   file://qt-mt.patch;patch=1"
 
 require kdepimpi-base.inc
 
+PR = "r2"
-PR = "r1"