- CPPSCRIPTS defined Xsession, but that had no CPPSCRIPTFLAGS_Xsession

line, which resulted in a broken Xsession file
- Use -DXPM for xdm-config too
- Move DEFAULTVT up before CPPSCRIPTS, so the later is in one block.

external/mit/xorg/bin/xdm/config/Makefile

@@ -1,13 +1,7 @@
-#	$NetBSD: Makefile,v 1.2 2008/08/27 23:47:08 rtr Exp $
+#	$NetBSD: Makefile,v 1.3 2008/11/09 13:02:36 veego Exp $
 
 .include <bsd.own.mk>
 
-CPPSCRIPTS=	Xresources Xservers.ws Xsession xdm-config 
-
-CPPSCRIPTFLAGS_Xresources=	-DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
-				-DXDM_PIXMAP=xorg.xpm \
-				-DXDM_BWPIXMAP=xorg-bw.xpm
-
 # native only gives DEFAULTVT for i386 and amd64.
 .if ${MACHINE} == "i386" || ${MACHINE} == "amd64"
 DEFAULTVT=vt05
@@ -15,11 +9,20 @@ DEFAULTVT=vt05
 DEFAULTVT=	# defined empty
 .endif
 
+CPPSCRIPTS=	Xresources Xservers.ws Xsession xdm-config 
+
+CPPSCRIPTFLAGS_Xresources=	-DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
+				-DXDM_PIXMAP=xorg.xpm \
+				-DXDM_BWPIXMAP=xorg-bw.xpm
 CPPSCRIPTFLAGS_Xservers.ws=	-DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
+CPPSCRIPTFLAGS_Xsession=	-DBINDIR=${X11BINDIR} \
+				-DMKTEMP_COMMAND=/usr/bin/mktemp \
+				-DSHELL_CMD=/bin/sh
 CPPSCRIPTFLAGS_xdm-config=	-DXDMDIR=${XDMDIR} \
 				-DXDMAUTHDIR=${XDMVARDIR} \
 				-DXDMLOGDIR=${XDMLOGDIR} \
 				-DXDMPIDDIR=${XDMPIDDIR} \
+				-DXPM \
 				-DSU="su -m"
 
 CONFIGFILES=		GiveConsole TakeConsole \