[oe-commits] Otavio Salvador : xorg-xserver-common.inc: usr ${datadir} instead of /usr/ share
git version control
git at git.openembedded.org
Wed Sep 14 13:25:33 UTC 2011
Module: meta-openembedded.git
Branch: master
Commit: 7f1ea2868a1f3ce20a6fe982d835a72c6cbf6ba3
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=7f1ea2868a1f3ce20a6fe982d835a72c6cbf6ba3
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Wed Sep 14 21:18:08 2011 +0000
xorg-xserver-common.inc: usr ${datadir} instead of /usr/share
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>
---
.../xorg-xserver/xorg-xserver-common.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
index e68008e..06763bb 100644
--- a/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
+++ b/meta-oe/recipes-graphics/xorg-xserver/xorg-xserver-common.inc
@@ -3,7 +3,7 @@ SECTION = "x11/base"
LICENSE = "MIT-X"
LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
-INC_PR = "r20"
+INC_PR = "r21"
# xf86-*-* packages depend on an X server built with the xfree86 DDX
# so we have a virtual to represent that:
@@ -44,7 +44,7 @@ EXTRA_OECONF += " --enable-xcalibrate \
--disable-xfbdev \
--disable-xnest \
--disable-kdrive-vesa \
- --with-default-font-path="/usr/share/fonts/X11/misc" \
+ --with-default-font-path="${datadir}/fonts/X11/misc" \
ac_cv_file__usr_share_sgml_X11_defs_ent=no"
# CONFIG_MANAGER_OPTION is used only in recipes which support those options
@@ -65,7 +65,7 @@ FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print"
FILES_${PN}-xvfb = "${bindir}/Xvfb"
FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d"
-FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled"
+FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled"
FILES_${PN}-xephyr = "${bindir}/Xephyr"
FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \
More information about the Openembedded-commits
mailing list