Module Name: src
Committed By: nia
Date: Thu Sep 24 06:52:48 UTC 2020
Modified Files:
src/external/mit/ctwm: Makefile
src/external/mit/ctwm/bin/ctwm: Makefile
Log Message:
revert; use system.ctwmrc from xsrc until I understand why the build fails
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/ctwm/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/ctwm/bin/ctwm/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/ctwm/Makefile
diff -u src/external/mit/ctwm/Makefile:1.3 src/external/mit/ctwm/Makefile:1.4
--- src/external/mit/ctwm/Makefile:1.3 Thu Sep 24 05:43:30 2020
+++ src/external/mit/ctwm/Makefile Thu Sep 24 06:52:48 2020
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2020/09/24 05:43:30 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/09/24 06:52:48 nia Exp $
# Top level Makefile to cross build xorg inside the NetBSD tree.
.include <bsd.own.mk>
-SUBDIR= bin etc libexec
+SUBDIR= bin libexec
.if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
BUILDTARGETS+= cleandir
Index: src/external/mit/ctwm/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.6 src/external/mit/ctwm/bin/ctwm/Makefile:1.7
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.6 Thu Sep 24 05:43:29 2020
+++ src/external/mit/ctwm/bin/ctwm/Makefile Thu Sep 24 06:52:48 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2020/09/24 05:43:29 nia Exp $
+# $NetBSD: Makefile,v 1.7 2020/09/24 06:52:48 nia Exp $
.include <bsd.own.mk>
@@ -44,7 +44,9 @@ FILES= 3D_Expand15.xpm 3D_Iconify15.xp
xedit.xpm xftp.xpm xgopher.xpm xgrab.xpm xhpcalc.xpm \
xirc.xpm xmail.xpm xman.xpm xmosaic.xpm xnomail.xpm \
xrn-compose.xpm xrn.goodnews.xpm xrn.nonews.xpm xrn.xpm \
- xterm.xpm
+ xterm.xpm system.ctwmrc
+
+FILESDIR_system.ctwmrc = ${CTWMCONFIGDIR}
LDADD+= -lXpm -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
