Module Name: src
Committed By: riz
Date: Fri Nov 26 17:08:05 UTC 2010
Modified Files:
src/x11/bin/xinit [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1482):
x11/bin/xinit/Makefile: revision 1.8
Disable USE_PAM on ports which have legacy non-XFree86 servers.
With this change, xinit(1) can properly quit Xserver after
xinitrc script exits.
Tested on dreamcast (-current) and hpcmips (netbsd-5).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.30.1 src/x11/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/x11/bin/xinit/Makefile
diff -u src/x11/bin/xinit/Makefile:1.7 src/x11/bin/xinit/Makefile:1.7.30.1
--- src/x11/bin/xinit/Makefile:1.7 Wed Mar 2 01:06:15 2005
+++ src/x11/bin/xinit/Makefile Fri Nov 26 17:08:04 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/02 01:06:15 christos Exp $
+# $NetBSD: Makefile,v 1.7.30.1 2010/11/26 17:08:04 riz Exp $
.include <bsd.own.mk>
@@ -13,8 +13,23 @@
CPPFLAGS+= -DXFREE86
.if (${USE_PAM} != "no")
+# XXX: Legacy non-XFree86 servers don't handle PAM
+.if \
+ ${MACHINE} != "alpha" && \
+ ${MACHINE} != "amiga" && \
+ ${MACHINE} != "dreamcast" && \
+ ${MACHINE} != "ews4800mips" && \
+ ${MACHINE} != "hpcarm" && \
+ ${MACHINE} != "hpcmips" && \
+ ${MACHINE} != "hpcsh" && \
+ ${MACHINE} != "newsmips" && \
+ ${MACHINE} != "pmax" && \
+ ${MACHINE} != "sun3" && \
+ ${MACHINE} != "x68k" && \
+ 1
CPPFLAGS+= -DUSE_PAM
.endif
+.endif
CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR}
