Module Name: src
Committed By: veego
Date: Sun May 23 21:35:36 UTC 2010
Modified Files:
src/external/mit/xorg/bin/xdm/config: Makefile
Log Message:
Replace UTMP_FILE and WTMP_FILE for Xstartup here and not in the cpp file
to make a xdm update easier.
xdm was updated but the local change in Xstartup.cpp was lost.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xdm/config/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/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.8 src/external/mit/xorg/bin/xdm/config/Makefile:1.9
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.8 Fri Dec 18 17:28:47 2009
+++ src/external/mit/xorg/bin/xdm/config/Makefile Sun May 23 21:35:35 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/12/18 17:28:47 christos Exp $
+# $NetBSD: Makefile,v 1.9 2010/05/23 21:35:35 veego Exp $
.include <bsd.own.mk>
@@ -19,7 +19,9 @@
CPPSCRIPTFLAGS_Xsession= -DBINDIR=${X11BINDIR} \
-DMKTEMP_COMMAND=/usr/bin/mktemp \
-DSHELL_CMD=/bin/sh
-CPPSCRIPTFLAGS_Xstartup= -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
+CPPSCRIPTFLAGS_Xstartup= -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR} \
+ -DUTMP_FILE=${XDMPIDDIR}/utmp \
+ -DWTMP_FILE=${XDMLOGDIR}/wtmp
CPPSCRIPTFLAGS_xdm-config= -DXDMDIR=${XDMDIR} \
-DXDMXAUTHDIR=${XDMVARDIR} \
-DXDMLOGDIR=${XDMLOGDIR} \