Source-Changes-HG archive

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

[src/netbsd-7]: src/external/mit/xorg/server/drivers Pull up following revisi...



details:   https://anonhg.NetBSD.org/src/rev/34f25d102863
branches:  netbsd-7
changeset: 799065:34f25d102863
user:      snj <snj%NetBSD.org@localhost>
date:      Mon Mar 09 08:47:19 2015 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #575):
        external/mit/xorg/server/drivers/Makefile: revision 1.65
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 c8cded6a802f -r 34f25d102863 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Mon Mar 09 08:45:26 2015 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Mon Mar 09 08:47:19 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.63.10.1 2015/03/09 08:45:26 snj Exp $
+#      $NetBSD: Makefile,v 1.63.10.2 2015/03/09 08:47:19 snj 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