summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/puzzles/oh-puzzles_svn.bb5
-rw-r--r--meta/packages/puzzles/puzzles_r6915.bb7
2 files changed, 3 insertions, 9 deletions
diff --git a/meta/packages/puzzles/oh-puzzles_svn.bb b/meta/packages/puzzles/oh-puzzles_svn.bb
index e501223b3c..75772919f3 100644
--- a/meta/packages/puzzles/oh-puzzles_svn.bb
+++ b/meta/packages/puzzles/oh-puzzles_svn.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
3SECTION = "x11" 3SECTION = "x11"
4DEPENDS = "gtk+" 4DEPENDS = "gtk+"
5PV = "0.1+svn${SRCDATE}" 5PV = "0.1+svn${SRCDATE}"
6PR = "r1" 6PR = "r2"
7 7
8inherit autotools pkgconfig 8inherit autotools pkgconfig
9 9
@@ -14,9 +14,6 @@ do_install_append () {
14 mv ${D}${bindir} ${D}/usr/games 14 mv ${D}${bindir} ${D}/usr/games
15 15
16 install -d ${D}/${datadir}/applications/ 16 install -d ${D}/${datadir}/applications/
17 install -d ${D}/${datadir}/pixmaps/
18
19 install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/
20 17
21 cd ${D}/${prefix}/games 18 cd ${D}/${prefix}/games
22 for prog in *; do 19 for prog in *; do
diff --git a/meta/packages/puzzles/puzzles_r6915.bb b/meta/packages/puzzles/puzzles_r6915.bb
index 399f601272..3342b5d17c 100644
--- a/meta/packages/puzzles/puzzles_r6915.bb
+++ b/meta/packages/puzzles/puzzles_r6915.bb
@@ -1,6 +1,6 @@
1 1
2DEPENDS = "gtk+" 2DEPENDS = "gtk+"
3PR = "r3" 3PR = "r4"
4 4
5SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz" 5SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar.gz"
6 6
@@ -8,7 +8,7 @@ do_compile_prepend = " \
8 export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \ 8 export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
9 export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; " 9 export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
10 10
11FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps" 11FILES_${PN} = "${prefix}/games/* ${datadir}/applications/*"
12FILES_${PN}-dbg += "${prefix}/games/.debug" 12FILES_${PN}-dbg += "${prefix}/games/.debug"
13 13
14do_install () { 14do_install () {
@@ -21,9 +21,6 @@ do_install () {
21 21
22 install -d ${D}/${datadir}/ 22 install -d ${D}/${datadir}/
23 install -d ${D}/${datadir}/applications/ 23 install -d ${D}/${datadir}/applications/
24 install -d ${D}/${datadir}/pixmaps/
25
26 install ${WORKDIR}/game.png ${D}/${datadir}/pixmaps/
27 24
28 cd ${D}/${prefix}/games 25 cd ${D}/${prefix}/games
29 for prog in *; do 26 for prog in *; do