From 851906447913c8396f373e271bfd175df2c70706 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Fri, 27 Sep 2019 11:25:59 +0200 Subject: xorg: modernize XORG_OPTIONS_TRANS Use ptx/endis and use the same order 'configure --help' from xorg-server and others. Signed-off-by: Michael Olbrich --- rules/pre/xorg-dirs.make | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/rules/pre/xorg-dirs.make b/rules/pre/xorg-dirs.make index 9873eed97..ddfa0086d 100644 --- a/rules/pre/xorg-dirs.make +++ b/rules/pre/xorg-dirs.make @@ -7,20 +7,11 @@ XORG_DATADIR := $(XORG_PREFIX)/share XORG_FONTDIR := $(XORG_PREFIX)/share/fonts/X11 XORG_BINDIR := /usr/bin -XORG_OPTIONS_TRANS = --disable-local-transport -ifdef PTXCONF_XORG_OPTIONS_TRANS_UNIX -XORG_OPTIONS_TRANS += --enable-unix-transport -else -XORG_OPTIONS_TRANS += --disable-unix-transport -endif - -ifdef PTXCONF_XORG_OPTIONS_TRANS_TCP -XORG_OPTIONS_TRANS += --enable-tcp-transport -else -XORG_OPTIONS_TRANS += --disable-tcp-transport -endif - -XORG_OPTIONS_TRANS += $(GLOBAL_IPV6_OPTION) +XORG_OPTIONS_TRANS := \ + --$(call ptx/endis,PTXCONF_XORG_OPTIONS_TRANS_UNIX)-unix-transport \ + --$(call ptx/endis,PTXCONF_XORG_OPTIONS_TRANS_TCP)-tcp-transport \ + $(GLOBAL_IPV6_OPTION) \ + --disable-local-transport XORG_OPTIONS_DOCS := \ --without-xmlto \ -- cgit v1.2.3