Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/server/drivers fix the previous; it had a ...



details:   https://anonhg.NetBSD.org/src/rev/ec12cfbe7071
branches:  trunk
changeset: 336437:ec12cfbe7071
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 01 11:19:08 2015 +0000

description:
fix the previous; it had a reversed test and was also missing bsd.own.mk
before checking MK* values.

diffstat:

 external/mit/xorg/server/drivers/Makefile |  11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r df272ed6091c -r ec12cfbe7071 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Sun Mar 01 10:07:01 2015 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Sun Mar 01 11:19:08 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.64 2015/03/01 07:46:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.65 2015/03/01 11:19:08 mrg Exp $
 
 # xf86-input drivers
 
@@ -19,14 +19,15 @@
 
 .endif
 
+# xf86-video drivers
 
-# xf86-video drivers
+.include <bsd.own.mk>
 
 # Set this to "no" to build the UMS-happy 6.x driver, vs KMS 7.x
-.if ${MKX11RADEONKMS:U} != "no"
+.if ${MKX11RADEONKMS} != "no"
+RADEON_SUBDIR=radeon-kms
+.else
 RADEON_SUBDIR=radeon
-.else
-RADEON_SUBDIR=radeon-kms
 .endif
 
 .if ${MACHINE_ARCH} == "i386" || \



Home | Main Index | Thread Index | Old Index