Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/ctwm unbreak. bsd.files.mk needs to have an inc...



details:   https://anonhg.NetBSD.org/src/rev/918b89289618
branches:  trunk
changeset: 976631:918b89289618
user:      nia <nia%NetBSD.org@localhost>
date:      Mon Sep 28 06:04:08 2020 +0000

description:
unbreak. bsd.files.mk needs to have an includes target, see also
share/wscons/fonts/Makefile

diffstat:

 external/mit/ctwm/Makefile          |  4 ++--
 external/mit/ctwm/bin/ctwm/Makefile |  6 ++----
 external/mit/ctwm/etc/Makefile      |  5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diffs (51 lines):

diff -r b35039401fd1 -r 918b89289618 external/mit/ctwm/Makefile
--- a/external/mit/ctwm/Makefile        Mon Sep 28 05:43:58 2020 +0000
+++ b/external/mit/ctwm/Makefile        Mon Sep 28 06:04:08 2020 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.4 2020/09/24 06:52:48 nia Exp $
+#      $NetBSD: Makefile,v 1.5 2020/09/28 06:04:08 nia Exp $
 
 # Top level Makefile to cross build xorg inside the NetBSD tree.
 
 .include <bsd.own.mk>
 
-SUBDIR=                bin libexec
+SUBDIR=                bin etc libexec
 
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
 BUILDTARGETS+=  cleandir
diff -r b35039401fd1 -r 918b89289618 external/mit/ctwm/bin/ctwm/Makefile
--- a/external/mit/ctwm/bin/ctwm/Makefile       Mon Sep 28 05:43:58 2020 +0000
+++ b/external/mit/ctwm/bin/ctwm/Makefile       Mon Sep 28 06:04:08 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2020/09/24 06:52:48 nia Exp $
+#      $NetBSD: Makefile,v 1.8 2020/09/28 06:04:08 nia Exp $
 
 .include <bsd.own.mk>
 
@@ -44,9 +44,7 @@
                        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 system.ctwmrc
-
-FILESDIR_system.ctwmrc = ${CTWMCONFIGDIR}
+                       xterm.xpm
 
 LDADD+=        -lXpm  -lXmu -lXt -lSM -lICE -lXext -lX11
 DPADD+=        ${LIBXPM} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
diff -r b35039401fd1 -r 918b89289618 external/mit/ctwm/etc/Makefile
--- a/external/mit/ctwm/etc/Makefile    Mon Sep 28 05:43:58 2020 +0000
+++ b/external/mit/ctwm/etc/Makefile    Mon Sep 28 06:04:08 2020 +0000
@@ -1,7 +1,10 @@
-#      $NetBSD: Makefile,v 1.1 2020/09/24 05:43:30 nia Exp $
+#      $NetBSD: Makefile,v 1.2 2020/09/28 06:04:08 nia Exp $
 
 FILESDIR=      ${X11ETCDIR}/ctwm
 FILESMODE=     644
 FILES=         system.ctwmrc
 
+realall:       ${FILES}
+
+.include <bsd.prog.mk>
 .include <bsd.files.mk>



Home | Main Index | Thread Index | Old Index