[oe-commits] org.oe.dev konqueror-embedded: fixed and adjusted to the new filesystem layout

[polyonymous commit]

konqueror-embedded: fixed and adjusted to the new filesystem layout

Author: polyonymous at openembedded.org
Branch: org.openembedded.dev
Revision: 14c9d8e832accb360973e1839aace6097ccfd698
ViewMTN: http://monotone.openembedded.org/revision.psp?id=14c9d8e832accb360973e1839aace6097ccfd698
Files:
1
packages/konqueror/konqueror-embedded_20070212.bb
Diffs:

#
# mt diff -reb704a1390c916f4e1c23a22cd7abe769ca7bba5 -r14c9d8e832accb360973e1839aace6097ccfd698
#
# 
# 
# patch "packages/konqueror/konqueror-embedded_20070212.bb"
#  from [69369052605125939c21fb95e60be4df696d1db9]
#    to [4b7b9152573fa0cb5af1e59387644f90358278dc]
# 
============================================================
--- packages/konqueror/konqueror-embedded_20070212.bb	69369052605125939c21fb95e60be4df696d1db9
+++ packages/konqueror/konqueror-embedded_20070212.bb	4b7b9152573fa0cb5af1e59387644f90358278dc
@@ -1,10 +1,10 @@ LICENSE = "LGPL GPL"
 DESCRIPTION = "KDE Web Browser Konqueror, QtE based Palmtop Environments Edition"
 SECTION = "opie/applications"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.konqueror.org/"
 DEPENDS = "openssl libpcre virtual/libqte2 dcopidl-native dcopidl2cpp-native"
 LICENSE = "LGPL GPL"
-PR = "r4"
+PR = "r5"
 
 # this Konqueror needs the KDEDIR set and the font helvetica installed on the target
 
@@ -19,7 +19,7 @@ export UIC = "${STAGING_BINDIR_NATIVE}/u
 export QMAKE = "${STAGING_BINDIR_NATIVE}/qmake"
 export MOC = "${STAGING_BINDIR_NATIVE}/moc"
 export UIC = "${STAGING_BINDIR_NATIVE}/uic"
-export exec_prefix = "${palmtopdir}"
+#export exec_prefix = "${palmtopdir}"
 #export CXXFLAGS = "-fexceptions -frtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DQT_NO_DOM -DENABLE_BOOKMARKS"
 export CXXFLAGS = "-fexceptions -fno-rtti -DKJS_VERBOSE=1 -DQT_THREAD_SUPPORT -DQ_OS_UNIX -DENABLE_BOOKMARKS"
 export PCRE_CONFIG = "invalid"
@@ -86,10 +86,10 @@ do_install_append() {
 	install -m 0644 ${FILESDIR}/konqueror.desktop ${D}${palmtopdir}/apps/Applications/
 	install -d ${D}${palmtopdir}/pics/konqueror
 	install -m 0644 ${FILESDIR}/konqueror.png ${D}${palmtopdir}/pics/konqueror/
-	mv ${D}${palmtopdir}/bin/konqueror ${D}${palmtopdir}/bin/konqueror.bin
-	{ echo '#!/bin/sh' ; echo "KDEDIR=/usr exec ${palmtopdir}/bin/konqueror.bin" ; } > ${D}${palmtopdir}/bin/konqueror
-	chmod 0755 ${D}${palmtopdir}/bin/konqueror
+	mv ${D}${palmtopdir}/bin ${D}${bindir}
+	mv ${D}${bindir}/konqueror ${D}${bindir}/konqueror.bin
+	{ echo '#!/bin/sh' ; echo "KDEDIR=/usr exec ${bindir}/konqueror.bin" ; } > ${D}${bindir}/konqueror
+	chmod 0755 ${D}${bindir}/konqueror
 }
 
+FILES_${PN} = "${palmtopdir} ${datadir} ${bindir}/konqueror* ${libdir}/libkonq*"
-FILES_${PN} = "${palmtopdir} ${datadir}"
-