Sat Oct 15 03:15:37 2011 UTC ()
Change the X11_TYPE conditional to work with the switch in the default
X11_TYPE to modular.


(sbd)
diff -r1.43 -r1.44 pkgsrc/mk/platform/Linux.mk
cvs diff -r1.43 -r1.44 pkgsrc/mk/platform/Linux.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/Linux.mk 2011/08/22 15:17:53 1.43
+++ pkgsrc/mk/platform/Linux.mk 2011/10/15 03:15:37 1.44
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Linux.mk,v 1.43 2011/08/22 15:17:53 cheusov Exp $ 1# $NetBSD: Linux.mk,v 1.44 2011/10/15 03:15:37 sbd Exp $
2# 2#
3# Variable definitions for the Linux operating system. 3# Variable definitions for the Linux operating system.
4 4
5ECHO_N?= ${ECHO} -n 5ECHO_N?= ${ECHO} -n
6.if !defined(X11_TYPE) || ${X11_TYPE} == "native" 6.if defined(X11_TYPE) && ${X11_TYPE} == "native"
7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake 7IMAKE_MAKE?= ${GMAKE} # program which gets invoked by imake
8IMAKE_TOOLS= gmake # extra tools required when we use imake 8IMAKE_TOOLS= gmake # extra tools required when we use imake
9.endif 9.endif
10IMAKEOPTS+= -DBuildHtmlManPages=NO 10IMAKEOPTS+= -DBuildHtmlManPages=NO
11PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
12PS?= /bin/ps 12PS?= /bin/ps
13# XXX: default from defaults/mk.conf. Verify/correct for this platform 13# XXX: default from defaults/mk.conf. Verify/correct for this platform
14# and remove this comment. 14# and remove this comment.
15.if exists(/usr/bin/su) 15.if exists(/usr/bin/su)
16SU?= /usr/bin/su 16SU?= /usr/bin/su
17.else 17.else
18SU?= /bin/su 18SU?= /bin/su
19.endif 19.endif