diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-01 11:50:56 +0530 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-12-01 11:50:56 +0530 |
| commit | 00ea05d9622d5ae732e53e4772e598137d8c309c (patch) | |
| tree | a3309149e035c991e80bc03cf1ca123dc83f3625 /recipes/mplayer | |
| parent | 7b52c2df97ca766b03d0e0ecb346007d9d335105 (diff) | |
| parent | 0c84ce234bb065fe646b79f26a8f789fd7d14d16 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/mplayer')
| -rw-r--r-- | recipes/mplayer/mplayer-common.bb | 10 | ||||
| -rw-r--r-- | recipes/mplayer/mplayer_0.0+1.0rc2.bb | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/recipes/mplayer/mplayer-common.bb b/recipes/mplayer/mplayer-common.bb index 3f3d5d2430..18da2ad342 100644 --- a/recipes/mplayer/mplayer-common.bb +++ b/recipes/mplayer/mplayer-common.bb @@ -11,7 +11,9 @@ HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml" ###################################################################################### PV = "0.0.1" -PR = "r1" +PR = "r2" + +PACKAGE_ARCH = "all" ###################################################################################### @@ -19,12 +21,12 @@ SRC_URI = "file://mplayer.conf" ###################################################################################### -FILES_${PN} = "/usr/etc/mplayer" +FILES_${PN} = "${sysconfdir}/mplayer" ###################################################################################### do_install() { - install -d "${D}/usr/etc/mplayer" + install -d "${D}${sysconfdir}/mplayer" - install -m 0644 ${WORKDIR}/mplayer.conf "${D}/usr/etc/mplayer" + install -m 0644 ${WORKDIR}/mplayer.conf "${D}${sysconfdir}/mplayer" } diff --git a/recipes/mplayer/mplayer_0.0+1.0rc2.bb b/recipes/mplayer/mplayer_0.0+1.0rc2.bb index 9a16dada8c..5b1d558836 100644 --- a/recipes/mplayer/mplayer_0.0+1.0rc2.bb +++ b/recipes/mplayer/mplayer_0.0+1.0rc2.bb @@ -46,7 +46,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r13" +PR = "r14" PARALLEL_MAKE = "" @@ -60,8 +60,7 @@ FILES_mencoder = "${bindir}/mencoder" inherit autotools pkgconfig EXTRA_OECONF = " \ - --prefix=/usr \ - --mandir=${mandir} \ + --prefix=${prefix} \ --target=${TARGET_SYS} \ \ --enable-mencoder \ |