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/xorg-server.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/xorg-server.make')
| -rw-r--r-- | rules/xorg-server.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/xorg-server.make b/rules/xorg-server.make index 2cdb925d0..fe60afed9 100644 --- a/rules/xorg-server.make +++ b/rules/xorg-server.make @@ -148,8 +148,8 @@ XORG_SERVER_CONF_OPT = \ # # if no value is given ignore the "--datadir" switch -ifneq ($(call remove_quotes,$(PTXCONF_XORG_DEFAULT_DATA_DIR)),) - XORG_SERVER_CONF_OPT += --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) +ifneq ($(call remove_quotes,$(XORG_DATADIR)),) + XORG_SERVER_CONF_OPT += --datadir=$(XORG_DATADIR) endif # @@ -193,7 +193,7 @@ endif ifdef PTXCONF_XORG_SERVER_UDEV @$(call install_copy, xorg-server, 0, 0, 0644, -, \ - /usr/lib/X11/xorg.conf.d/10-evdev.conf) + $(XORG_DATADIR)/X11/xorg.conf.d/10-evdev.conf) endif ifdef PTXCONF_XORG_SERVER_XVFB |