Module Name: src
Committed By: nia
Date: Mon Sep 21 08:20:05 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
Define CTWM when building xinit
This will allow ctwm to eventually be used in the default xinitrc.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.7 src/external/mit/xorg/bin/xinit/Makefile:1.8
--- src/external/mit/xorg/bin/xinit/Makefile:1.7 Mon Mar 11 06:25:55 2019
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Sep 21 08:20:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $
.include <bsd.own.mk>
@@ -13,10 +13,12 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION} -DBIND
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 \
+ -DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
+ -DCTWM=${X11BINDIR}/ctwm \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
