summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-10-18 18:08:46 +0000
committermartin <martin@NetBSD.org>2020-10-18 18:08:46 +0000
commit6fc58763a915dbacae31a5da114853faec7f5c8a (patch)
tree37b7bad1cc790bc30d8a5c4431373fb5fde1ee5e /external
parenta8f5540be9216399aeb75700db80eabecca5a278 (diff)
Pull up following revision(s) (requested by nia in ticket #1115):
external/mit/xorg/bin/xinit/Makefile: revision 1.8 external/mit/xorg/bin/xinit/Makefile: revision 1.9 Define CTWM when building xinit This will allow ctwm to eventually be used in the default xinitrc. also allow uxterm to be used in the default xinitrc
Diffstat (limited to 'external')
-rw-r--r--external/mit/xorg/bin/xinit/Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/external/mit/xorg/bin/xinit/Makefile b/external/mit/xorg/bin/xinit/Makefile
index 1b4ac2ebc38..bfbd27f7392 100644
--- a/external/mit/xorg/bin/xinit/Makefile
+++ b/external/mit/xorg/bin/xinit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2020/10/18 18:08:46 martin Exp $
.include <bsd.own.mk>
@@ -13,10 +13,14 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION} -DBINDIR=\"${X11BINDIR}\" \
CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
- -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm
+ -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DUXTERM=${X11BINDIR}/uxterm \
+ -DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
+ -DUXTERM=${X11BINDIR}/uxterm \
+ -DCTWM=${X11BINDIR}/ctwm \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'