diff options
| author | Philipp Zabel <p.zabel@pengutronix.de> | 2015-12-04 14:57:25 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2015-12-09 20:36:59 +0100 |
| commit | df16c62e201df2e48ae69b923e4099242b203c4d (patch) | |
| tree | 10e4a5864ccfe4f404ac6ab66ff9d66be82ea209 /rules/libxkbcommon.make | |
| parent | 2763fbe75f3f5667df7f701b3e332062edafb701 (diff) | |
| download | ptxdist-df16c62e201df2e48ae69b923e4099242b203c4d.tar.gz ptxdist-df16c62e201df2e48ae69b923e4099242b203c4d.tar.xz | |
xorg: remove XORG_DEFAULT_DATA_DIR configuration option
Modern distributions set datadir to /usr/share instead of /usr/lib.
Replace the XORG_DEFAULT_DATA_DIR configuration option with a fixed
XORG_DATADIR variable and point it to /usr/share.
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
[mol: fix libx11, xorg-server targetinstall]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/libxkbcommon.make')
| -rw-r--r-- | rules/libxkbcommon.make | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make index 1be190a14..339f6caa6 100644 --- a/rules/libxkbcommon.make +++ b/rules/libxkbcommon.make @@ -40,7 +40,7 @@ LIBXKBCOMMON_CONF_OPT := \ --disable-strict-compilation \ --disable-docs \ --$(call ptx/endis, PTXCONF_LIBXKBCOMMON_X11)-x11 \ - --with-xkb-config-root=$(PTXCONF_XORG_DEFAULT_DATA_DIR)/X11/xkb + --with-xkb-config-root=$(XORG_DATADIR)/X11/xkb # ---------------------------------------------------------------------------- # Target-Install |