From abb9afcff654c89fd5c594c09973b05b360c2450 Mon Sep 17 00:00:00 2001
From: Paul Sokolovsky <pmiscml@gmail.com>
Date: Fri, 11 Jan 2008 23:57:55 +0000
Subject: sdl.bbclass: Revamp to adhere to freedesktop standards. * OPIE in OE
 now adheres to FHS, so ${palmtopdir} is no more. * OPIE in OE doesn't haev
 SDL support, so: make this bbclass produce correct pixmap/.desktop per
 freedesktop standards, then TODO: make OPIE use the same. * Also, run after
 main install and before packaging, more natural (and will allow to check if
 standard install dropped icon/.desktop already).

---
 classes/sdl.bbclass | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'classes/sdl.bbclass')

diff --git a/classes/sdl.bbclass b/classes/sdl.bbclass
index e819eb1c52..161b53c713 100644
--- a/classes/sdl.bbclass
+++ b/classes/sdl.bbclass
@@ -4,37 +4,37 @@
 
 DEPENDS += "virtual/libsdl libsdl-mixer libsdl-image"
 
-APPDESKTOP ?= "${PN}.desktop"
+APPDESKTOP ?= "${WORKDIR}/${PN}.desktop"
 APPNAME ?= "${PN}"
 APPIMAGE ?= "${WORKDIR}/${PN}.png"
 
 sdl_do_sdl_install() {
-	install -d ${D}${palmtopdir}/bin
-	install -d ${D}${palmtopdir}/pics
-	install -d ${D}${palmtopdir}/apps/Games
-	ln -sf ${bindir}/${APPNAME} ${D}${palmtopdir}/bin/${APPNAME}
-	install -m 0644 ${APPIMAGE} ${D}${palmtopdir}/pics/${PN}.png
+	install -d ${D}${datadir}/applications
+	install -d ${D}${datadir}/pixmaps
+
+	install -m 0644 ${APPIMAGE} ${D}${datadir}/pixmaps/${PN}.png
 
 	if [ -e "${APPDESKTOP}" ]
 	then
-		echo ${APPDESKTOP} present, installing to palmtopdir...
-		install -m 0644 ${APPDESKTOP} ${D}${palmtopdir}/apps/Games/${PN}.desktop
+		echo ${APPDESKTOP} present, using it...
+		install -m 0644 ${APPDESKTOP} ${D}${datadir}/applications/
 	else
 		echo ${APPDESKTOP} not present, creating one on-the-fly...
-		cat >${D}${palmtopdir}/apps/Games/${PN}.desktop <<EOF
+		cat >${D}${datadir}/applications/${PN}.desktop <<EOF
 [Desktop Entry]
-Note=Auto Generated... this may be not what you want
+Name=${PN}
 Comment=${DESCRIPTION}
+Note=Auto Generated by OE SDL bbclass
 Exec=${APPNAME}
 Icon=${PN}.png
 Type=Application
-Name=${PN}
+Categories=Games
 EOF
 	fi
 }
 
 EXPORT_FUNCTIONS do_sdl_install
-addtask sdl_install after do_compile before do_populate_staging
+addtask sdl_install after do_install before do_package
 
 SECTION = "x11/games"
 SECTION_${PN}-opie = "opie/games"
-- 
cgit v1.2.3