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/xkeyboard-config.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/xkeyboard-config.make')
| -rw-r--r-- | rules/xkeyboard-config.make | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rules/xkeyboard-config.make b/rules/xkeyboard-config.make index d4f5071cf..dd6b75bcd 100644 --- a/rules/xkeyboard-config.make +++ b/rules/xkeyboard-config.make @@ -37,7 +37,7 @@ XKEYBOARD_CONFIG_ENV := $(CROSS_ENV) # XKEYBOARD_CONFIG_AUTOCONF := \ $(CROSS_AUTOCONF_USR) \ - --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) + --datadir=$(XORG_DATADIR) # ---------------------------------------------------------------------------- # Target-Install @@ -53,11 +53,11 @@ $(STATEDIR)/xkeyboard-config.targetinstall: @$(call install_fixup, xkeyboard-config,DESCRIPTION,missing) @cd $(XKEYBOARD_CONFIG_PKGDIR) && \ - for dir in `find .$(PTXCONF_XORG_DEFAULT_DATA_DIR)/X11/xkb -type d`; do \ + for dir in `find .$(XORG_DATADIR)/X11/xkb -type d`; do \ $(call install_copy, xkeyboard-config, 0, 0, 0755, /$$dir); \ done @cd $(XKEYBOARD_CONFIG_PKGDIR) && \ - for file in `find .$(PTXCONF_XORG_DEFAULT_DATA_DIR)/X11/xkb -type f`; do\ + for file in `find .$(XORG_DATADIR)/X11/xkb -type f`; do\ $(call install_copy, xkeyboard-config, 0, 0, 0644, \ $(XKEYBOARD_CONFIG_PKGDIR)/$$file, /$$file); \ done |