Module Name: src
Committed By: jmcneill
Date: Tue Nov 10 23:09:13 UTC 2015
Modified Files:
src/external/mit/ctwm/bin/ctwm: Makefile
Log Message:
fix default pixmap search directory
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 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/bin/ctwm/Makefile
diff -u src/external/mit/ctwm/bin/ctwm/Makefile:1.1 src/external/mit/ctwm/bin/ctwm/Makefile:1.2
--- src/external/mit/ctwm/bin/ctwm/Makefile:1.1 Thu Sep 3 22:24:02 2015
+++ src/external/mit/ctwm/bin/ctwm/Makefile Tue Nov 10 23:09:13 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/09/03 22:24:02 youri Exp $
+# $NetBSD: Makefile,v 1.2 2015/11/10 23:09:13 jmcneill Exp $
.include <bsd.own.mk>
@@ -16,11 +16,12 @@ CTWMDIR= ${X11SRCDIR}/external/mit/ctwm
XPMDIR= ${X11INCDIR}/X11/pixmaps/ctwm
CPPFLAGS+= -I. -I${CTWMDIR}/src \
- -DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM \
+ -DNO_ALLOCA -DCSRG_BASED -DUSEM4 -DGNOME -DXPM
+
+CPPFLAGS+= -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
CPPFLAGS.parse.c= -DSYSTEM_INIT_FILE=\"${CTWMCONFIGDIR}/system.twmrc\" \
- -DM4CMD=\"m4\" \
- -DPIXMAP_DIRECTORY=\"${XPMDIR}\"
+ -DM4CMD=\"m4\"
FILESDIR= ${XPMDIR}
