[PATCH 0/3] Small fixes for xserver-xf86 inc files

[PATCH 0/3] Small fixes for xserver-xf86 inc files

[Otavio Salvador]

The following changes since commit 8df322abfd3fa8c460fd73c83c1ef0b5e419dc11:

  core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 01:27:08 +0100)

are available in the git repository at:
  git://github.com/OSSystems/oe-core master
  https://github.com/OSSystems/oe-core/tree/master

Otavio Salvador (3):
  xserver-xf86-common.inc: use ${datadir} instead of /usr/share
  xserver-xf86-dri-lite.inc: use ${datadir} instead of /usr/share
  xserver-xf86-lite.inc: use ${datadir} instead of /usr/share

 .../xorg-xserver/xserver-xf86-common.inc           |    2 +-
 .../xorg-xserver/xserver-xf86-dri-lite.inc         |    2 +-
 .../xorg-xserver/xserver-xf86-lite.inc             |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.2.5

[PATCH 1/3] xserver-xf86-common.inc: use ${datadir} instead of /usr/share

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xorg-xserver/xserver-xf86-common.inc           |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
index b1a0f08..000aea3 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-common.inc
@@ -25,7 +25,7 @@ RDEPENDS_${PN} += "xserver-xf86-config xkeyboard-config"
 
 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} = "${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/xserver/SecurityPolicy ${libdir}/xorg/modules/*.so ${libdir}/xorg/modules/*/*.so ${libdir}/xorg/modules/*/*/*.so /etc/X11 "
-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}-dbg += "${libdir}/xorg/modules/.debug \
                     ${libdir}/xorg/modules/*/.debug \
-- 
1.7.2.5

[PATCH 2/3] xserver-xf86-dri-lite.inc: use ${datadir} instead of /usr/share

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xorg-xserver/xserver-xf86-dri-lite.inc         |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
index db2d126..3aca760 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
@@ -28,7 +28,7 @@ EXTRA_OECONF += "--disable-static \
                  --localstatedir=/var \
                  --with-pic \
                  --with-int10=x86emu \
-                 --with-fontdir=/usr/share/fonts/X11 \
+                 --with-fontdir=${datadir}/fonts/X11 \
                  --with-xkb-output=/var/lib/xkb \
                  ac_cv_file__usr_share_sgml_X11_defs_ent=no"
 
-- 
1.7.2.5

[PATCH 3/3] xserver-xf86-lite.inc: use ${datadir} instead of /usr/share

[Otavio Salvador]

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../xorg-xserver/xserver-xf86-lite.inc             |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
index 7150a2a..5447058 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-lite.inc
@@ -29,6 +29,6 @@ EXTRA_OECONF += "--disable-static \
                  --disable-glx \
                  --sysconfdir=/etc/X11 \
                  --localstatedir=/var \
-                 --with-fontdir=/usr/share/fonts/X11 \
+                 --with-fontdir=${datadir}/fonts/X11 \
                  --with-xkb-output=/var/lib/xkb \
                  ac_cv_file__usr_share_sgml_X11_defs_ent=no"
-- 
1.7.2.5