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>

21 files changed, 51 insertions, 60 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
diff --git a/rules/pre/xorg-dirs.make b/rules/pre/xorg-dirs.make
index a7b7093ca..9873eed97 100644
--- a/rules/pre/xorg-dirs.make
+++ b/rules/pre/xorg-dirs.make
@@ -3,6 +3,7 @@
 # these are the defaults path definitions for xorg stuff
 XORG_PREFIX  := /usr
 XORG_LIBDIR  := $(XORG_PREFIX)/lib
+XORG_DATADIR := $(XORG_PREFIX)/share
 XORG_FONTDIR := $(XORG_PREFIX)/share/fonts/X11
 XORG_BINDIR  := /usr/bin
 
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
diff --git a/rules/xorg-app-iceauth.make b/rules/xorg-app-iceauth.make
index bbcdb833d..b6b16444a 100644
--- a/rules/xorg-app-iceauth.make
+++ b/rules/xorg-app-iceauth.make
@@ -35,7 +35,7 @@ XORG_APP_ICEAUTH_DIR		:= $(BUILDDIR)/$(XORG_APP_ICEAUTH)
 XORG_APP_ICEAUTH_CONF_TOOL	:= autoconf
 XORG_APP_ICEAUTH_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-mkfontdir.make b/rules/xorg-app-mkfontdir.make
index 59b0a3d57..14aaf5601 100644
--- a/rules/xorg-app-mkfontdir.make
+++ b/rules/xorg-app-mkfontdir.make
@@ -36,7 +36,7 @@ XORG_APP_MKFONTDIR_LICENSE	:= MIT
 XORG_APP_MKFONTDIR_CONF_TOOL	:= autoconf
 XORG_APP_MKFONTDIR_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-mkfontscale.make b/rules/xorg-app-mkfontscale.make
index e4e4998ea..ea063aa24 100644
--- a/rules/xorg-app-mkfontscale.make
+++ b/rules/xorg-app-mkfontscale.make
@@ -36,7 +36,7 @@ XORG_APP_MKFONTSCALE_LICENSE	:= MIT
 XORG_APP_MKFONTSCALE_CONF_TOOL	:= autoconf
 XORG_APP_MKFONTSCALE_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-rgb.make b/rules/xorg-app-rgb.make
index 34fc6aa59..ccb1cdff2 100644
--- a/rules/xorg-app-rgb.make
+++ b/rules/xorg-app-rgb.make
@@ -38,7 +38,7 @@ XORG_APP_RGB_ENV 	:= $(CROSS_ENV)
 #
 XORG_APP_RGB_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -54,7 +54,7 @@ $(STATEDIR)/xorg-app-rgb.targetinstall:
 	@$(call install_fixup, xorg-app-rgb,DESCRIPTION,missing)
 
 	@$(call install_copy, xorg-app-rgb, 0, 0, 0644, -, \
-		$(PTXCONF_XORG_DEFAULT_DATA_DIR)/X11/rgb.txt, n)
+		$(XORG_DATADIR)/X11/rgb.txt, n)
 
 	@$(call install_finish, xorg-app-rgb)
 
diff --git a/rules/xorg-app-setxkbmap.make b/rules/xorg-app-setxkbmap.make
index f75f66441..cde8bba9e 100644
--- a/rules/xorg-app-setxkbmap.make
+++ b/rules/xorg-app-setxkbmap.make
@@ -34,7 +34,7 @@ XORG_APP_SETXKBMAP_DIR		:= $(BUILDDIR)/$(XORG_APP_SETXKBMAP)
 XORG_APP_SETXKBMAP_CONF_TOOL	:= autoconf
 XORG_APP_SETXKBMAP_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-xauth.make b/rules/xorg-app-xauth.make
index a87308489..7e5471677 100644
--- a/rules/xorg-app-xauth.make
+++ b/rules/xorg-app-xauth.make
@@ -35,7 +35,7 @@ XORG_APP_XAUTH_CONF_TOOL	:= autoconf
 XORG_APP_XAUTH_CONF_OPT		:= \
 	$(CROSS_AUTOCONF_USR) \
 	$(XORG_OPTIONS_TRANS) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-xdm.make b/rules/xorg-app-xdm.make
index d319dc2ef..1e7570656 100644
--- a/rules/xorg-app-xdm.make
+++ b/rules/xorg-app-xdm.make
@@ -38,7 +38,7 @@ XORG_APP_XDM_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
 	$(XORG_OPTIONS_TRANS) \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_SECURE_RPC)-secure-rpc \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) \
+	--datadir=$(XORG_DATADIR) \
 	--enable-xpm-logos \
 	--disable-xdmshell \
 	--disable-xdm-auth \
diff --git a/rules/xorg-app-xeyes.make b/rules/xorg-app-xeyes.make
index d72b351e4..480d79c78 100644
--- a/rules/xorg-app-xeyes.make
+++ b/rules/xorg-app-xeyes.make
@@ -37,7 +37,7 @@ XORG_APP_XEYES_ENV 	:= $(CROSS_ENV)
 #
 XORG_APP_XEYES_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-xhost.make b/rules/xorg-app-xhost.make
index eb0263330..111455270 100644
--- a/rules/xorg-app-xhost.make
+++ b/rules/xorg-app-xhost.make
@@ -36,7 +36,7 @@ XORG_APP_XHOST_CONF_TOOL	:= autoconf
 XORG_APP_XHOST_CONF_OPT		:= \
 	$(CROSS_AUTOCONF_USR) \
 	$(XORG_OPTIONS_TRANS) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) \
+	--datadir=$(XORG_DATADIR) \
 	--$(call ptx/endis, PTXCONF_XORG_SERVER_OPT_SECURE_RPC)-secure-rpc
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-app-xinit.make b/rules/xorg-app-xinit.make
index f1cdb24f0..5c2e9d6e1 100644
--- a/rules/xorg-app-xinit.make
+++ b/rules/xorg-app-xinit.make
@@ -42,7 +42,7 @@ XORG_APP_XINIT_CONF_TOOL := autoconf
 XORG_APP_XINIT_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
 	--with-xinitdir=/etc/X11/xinit \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-xkbcomp.make b/rules/xorg-app-xkbcomp.make
index 1716dc6e5..dd6969e32 100644
--- a/rules/xorg-app-xkbcomp.make
+++ b/rules/xorg-app-xkbcomp.make
@@ -39,7 +39,7 @@ XORG_APP_XKBCOMP_CON_ENV := \
 XORG_APP_XKBCOMP_CONF_TOOL	:= autoconf
 XORG_APP_XKBCOMP_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-xprop.make b/rules/xorg-app-xprop.make
index ce071c237..3dfcd572b 100644
--- a/rules/xorg-app-xprop.make
+++ b/rules/xorg-app-xprop.make
@@ -35,7 +35,7 @@ XORG_APP_XPROP_DIR	:= $(BUILDDIR)/$(XORG_APP_XPROP)
 XORG_APP_XPROP_CONF_TOOL	:= autoconf
 XORG_APP_XPROP_CONF_OPT		:= \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-xset.make b/rules/xorg-app-xset.make
index 0c1a7fc49..98e6a8ae1 100644
--- a/rules/xorg-app-xset.make
+++ b/rules/xorg-app-xset.make
@@ -34,7 +34,7 @@ XORG_APP_XSET_DIR	:= $(BUILDDIR)/$(XORG_APP_XSET)
 XORG_APP_XSET_CONF_TOOL	:= autoconf
 XORG_APP_XSET_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR) \
+	--datadir=$(XORG_DATADIR) \
 	--with-xf86misc
 
 # ----------------------------------------------------------------------------
diff --git a/rules/xorg-app-xsetroot.make b/rules/xorg-app-xsetroot.make
index c0fe42bea..914f0ecc8 100644
--- a/rules/xorg-app-xsetroot.make
+++ b/rules/xorg-app-xsetroot.make
@@ -36,7 +36,7 @@ XORG_APP_XSETROOT_ENV 	:= $(CROSS_ENV)
 #
 XORG_APP_XSETROOT_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-app-xvinfo.make b/rules/xorg-app-xvinfo.make
index 367a5a556..eeca1691c 100644
--- a/rules/xorg-app-xvinfo.make
+++ b/rules/xorg-app-xvinfo.make
@@ -37,7 +37,7 @@ XORG_APP_XVINFO_ENV 	:= $(CROSS_ENV)
 #
 XORG_APP_XVINFO_AUTOCONF := \
 	$(CROSS_AUTOCONF_USR) \
-	--datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+	--datadir=$(XORG_DATADIR)
 
 # ----------------------------------------------------------------------------
 # Target-Install
diff --git a/rules/xorg-lib-X11.make b/rules/xorg-lib-X11.make
index 208788c81..226cc7632 100644
--- a/rules/xorg-lib-X11.make
+++ b/rules/xorg-lib-X11.make
@@ -62,8 +62,8 @@ XORG_LIB_X11_CONF_OPT	:= \
 #
 # if no value is given ignore the "--datadir" switch
 #
-ifneq ($(call remove_quotes,$(PTXCONF_XORG_DEFAULT_DATA_DIR)),)
-XORG_LIB_X11_CONF_OPT += --datadir=$(PTXCONF_XORG_DEFAULT_DATA_DIR)
+ifneq ($(call remove_quotes,$(XORG_DATADIR)),)
+XORG_LIB_X11_CONF_OPT += --datadir=$(XORG_DATADIR)
 endif
 
 # missing configure switches:
@@ -91,44 +91,44 @@ $(STATEDIR)/xorg-lib-x11.targetinstall:
 #		/usr/lib/X11/XKeysymDB)
 
 ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE
-	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, /usr/lib/X11/locale)
+	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/locale.alias,n)
+		$(XORG_DATADIR)/X11/locale/locale.alias,n)
 
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/locale.dir,n)
+		$(XORG_DATADIR)/X11/locale/locale.dir,n)
 
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/compose.dir,n)
+		$(XORG_DATADIR)/X11/locale/compose.dir,n)
 
-	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, /usr/lib/X11/locale/C)
+	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale/C)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/C/Compose,n)
+		$(XORG_DATADIR)/X11/locale/C/Compose,n)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/C/XI18N_OBJS,n)
+		$(XORG_DATADIR)/X11/locale/C/XI18N_OBJS,n)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/C/XLC_LOCALE,n)
+		$(XORG_DATADIR)/X11/locale/C/XLC_LOCALE,n)
 
 endif
 
 ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_8859_1
-	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, /usr/lib/X11/locale/iso8859-1)
+	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale/iso8859-1)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/iso8859-1/Compose,n)
+		$(XORG_DATADIR)/X11/locale/iso8859-1/Compose,n)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/iso8859-1/XI18N_OBJS,n)
+		$(XORG_DATADIR)/X11/locale/iso8859-1/XI18N_OBJS,n)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/iso8859-1/XLC_LOCALE,n)
+		$(XORG_DATADIR)/X11/locale/iso8859-1/XLC_LOCALE,n)
 endif
 
 ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_8859_15
-	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, /usr/lib/X11/locale/iso8859-15)
+	@$(call install_copy, xorg-lib-x11, 0, 0, 0755, $(XORG_DATADIR)/X11/locale/iso8859-15)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/iso8859-15/Compose,n)
+		$(XORG_DATADIR)/X11/locale/iso8859-15/Compose,n)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/iso8859-15/XI18N_OBJS,n)
+		$(XORG_DATADIR)/X11/locale/iso8859-15/XI18N_OBJS,n)
 	@$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-		/usr/lib/X11/locale/iso8859-15/XLC_LOCALE,n)
+		$(XORG_DATADIR)/X11/locale/iso8859-15/XLC_LOCALE,n)
 endif
 
 ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_CHN_MAIN
@@ -137,11 +137,11 @@ ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_CHN_MAIN
 		echo "scanning $$file"; \
 		if [ -d $$file ]; then \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/Compose,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/Compose,n); \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/XI18N_OBJS,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/XI18N_OBJS,n); \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/XLC_LOCALE,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/XLC_LOCALE,n); \
 		fi; \
 	done;
 endif
@@ -151,11 +151,11 @@ ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_CHN_HK
 	for file in `find . -name "*zh_HK*" -type d`; do \
 		if [ -d $$file ]; then \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/Compose,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/Compose,n); \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/XI18N_OBJS,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/XI18N_OBJS,n); \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/XLC_LOCALE,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/XLC_LOCALE,n); \
 		fi; \
 	done;
 endif
@@ -165,11 +165,11 @@ ifdef PTXCONF_XORG_LIB_X11_INSTALL_LOCALE_CHN_TW
 	for file in `find . -name "*zh_TW*" -type d`; do \
 		if [ -d $$file ]; then \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/Compose,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/Compose,n); \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/XI18N_OBJS,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/XI18N_OBJS,n); \
 			$(call install_copy, xorg-lib-x11, 0, 0, 0644, -, \
-				/usr/lib/X11/locale/$$file/XLC_LOCALE,n); \
+				$(XORG_DATADIR)/X11/locale/$$file/XLC_LOCALE,n); \
 		fi; \
 	done;
 endif
diff --git a/rules/xorg-options.in b/rules/xorg-options.in
index 3bf96c398..0a26fa984 100644
--- a/rules/xorg-options.in
+++ b/rules/xorg-options.in
@@ -47,16 +47,6 @@ config XORG_KEYBOARD_MAPPING_SUPPORT
 	  Note: A german keyboard does not support the '@¤\[]{}|' keys when
 	  disabled!
 
-config XORG_DEFAULT_DATA_DIR
-	string
-	prompt "default location for x' data files"
-	default "/usr/lib"
-	help
-	  Define here the default path, where X searches for its data files
-	  (fonts, configurations, keyboard mappings, etc.). X adds an "X11"
-	  postfix to this path. So /usr/lib as a default path will result in
-	  /usr/lib/X11 with additional subdirectories for all the data files.
-
 config XORG_OPTIONS_TRANS_UNIX
 	bool
 	prompt "unix domain socket transport"
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