diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-09-27 11:25:59 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-10-01 21:35:27 +0200 |
| commit | 851906447913c8396f373e271bfd175df2c70706 (patch) | |
| tree | 4e169903b7c1e418e30db268f0955d798c5ce0ac /rules | |
| parent | b2380625c1250365699eaa87e14e429e3f4c87a0 (diff) | |
| download | ptxdist-851906447913c8396f373e271bfd175df2c70706.tar.gz ptxdist-851906447913c8396f373e271bfd175df2c70706.tar.xz | |
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 <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/pre/xorg-dirs.make | 19 |
1 files 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 \ |