diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2011-09-14 21:18:08 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-09-14 15:25:13 +0200 |
| commit | 7f1ea2868a1f3ce20a6fe982d835a72c6cbf6ba3 (patch) | |
| tree | 34d7996d17888d7ad6d66f15e9e94abc59f02a37 /meta-oe/recipes-graphics | |
| parent | 0a2a6e16334c15f460ea5eba426e3f6f1d3d1936 (diff) | |
| download | meta-openembedded-7f1ea2868a1f3ce20a6fe982d835a72c6cbf6ba3.tar.gz | |
xorg-xserver-common.inc: usr ${datadir} instead of /usr/share
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-graphics')
| -rw-r--r-- | meta-oe/recipes-graphics/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 e68008e4c..06763bbf4 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" | |||
| 3 | LICENSE = "MIT-X" | 3 | LICENSE = "MIT-X" |
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353" |
| 5 | 5 | ||
| 6 | INC_PR = "r20" | 6 | INC_PR = "r21" |
| 7 | 7 | ||
| 8 | # xf86-*-* packages depend on an X server built with the xfree86 DDX | 8 | # xf86-*-* packages depend on an X server built with the xfree86 DDX |
| 9 | # so we have a virtual to represent that: | 9 | # so we have a virtual to represent that: |
| @@ -44,7 +44,7 @@ EXTRA_OECONF += " --enable-xcalibrate \ | |||
| 44 | --disable-xfbdev \ | 44 | --disable-xfbdev \ |
| 45 | --disable-xnest \ | 45 | --disable-xnest \ |
| 46 | --disable-kdrive-vesa \ | 46 | --disable-kdrive-vesa \ |
| 47 | --with-default-font-path="/usr/share/fonts/X11/misc" \ | 47 | --with-default-font-path="${datadir}/fonts/X11/misc" \ |
| 48 | ac_cv_file__usr_share_sgml_X11_defs_ent=no" | 48 | ac_cv_file__usr_share_sgml_X11_defs_ent=no" |
| 49 | 49 | ||
| 50 | # CONFIG_MANAGER_OPTION is used only in recipes which support those options | 50 | # CONFIG_MANAGER_OPTION is used only in recipes which support those options |
| @@ -65,7 +65,7 @@ FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" | |||
| 65 | FILES_${PN}-xvfb = "${bindir}/Xvfb" | 65 | FILES_${PN}-xvfb = "${bindir}/Xvfb" |
| 66 | 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" | 66 | 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" |
| 67 | 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" | 67 | 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" |
| 68 | FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" | 68 | FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled" |
| 69 | FILES_${PN}-xephyr = "${bindir}/Xephyr" | 69 | FILES_${PN}-xephyr = "${bindir}/Xephyr" |
| 70 | 70 | ||
| 71 | FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ | 71 | FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ |