Fri Oct 3 05:14:01 2008 UTC ()
actually pass -DPCI_VIA_TTYE0 on sparc(64), also don't overwrite other
options


(macallan)
diff -r1.19 -r1.20 src/x11/Xserver/hw/xfree86/xf86_os/Makefile

cvs diff -r1.19 -r1.20 src/x11/Xserver/hw/xfree86/xf86_os/Attic/Makefile (expand / switch to context diff)
--- src/x11/Xserver/hw/xfree86/xf86_os/Attic/Makefile 2008/04/23 05:13:43 1.19
+++ src/x11/Xserver/hw/xfree86/xf86_os/Attic/Makefile 2008/10/03 05:14:01 1.20
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.19 2008/04/23 05:13:43 macallan Exp $
+#	$NetBSD: Makefile,v 1.20 2008/10/03 05:14:01 macallan Exp $
 
 .include "../../../Makefile.serverlib"
 
@@ -49,8 +49,7 @@
 SRCS.bsd+=	sparc64_video.c bsdResource.c pm_noop.c lnx_agp.c \
 		ioperm_noop.c netbsdSbus.c
 .for _FN in ${SRCS.bsd}
-CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC \
-			-DPCI_VIA_TTYE0
+CPPFLAGS.${_FN}=	-DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
 .endfor
 .endif
 
@@ -89,9 +88,10 @@
 SRCS.bus+=	netbsdPci.c
 .endif
 
-.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc"
+.if ${MACHINE} == "macppc" || ${MACHINE} == "ofppc" || \
+    ${MACHINE} == "sparc64" || ${MACHINE} == "sparc"
 .for _FN in ${SRCS.bus}
-CPPFLAGS.${_FN}=	-DPCI_VIA_TTYE0
+CPPFLAGS.${_FN}+=	-DPCI_VIA_TTYE0
 .endfor
 .endif