Module Name:    src
Committed By:   mrg
Date:           Fri Aug 19 10:23:26 UTC 2016

Modified Files:
        src/distrib/sets: sets.subr

Log Message:
xorg_server_ver doesn't depend upon xorg_server though it probably could.
fixes build isses with header files being missing.

XXX: with no server, they shouldn't be useful, so fix this properly by
not installing them once it is verified to work properly.


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/sets.subr

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.177 src/distrib/sets/sets.subr:1.178
--- src/distrib/sets/sets.subr:1.177	Tue Aug 16 01:05:19 2016
+++ src/distrib/sets/sets.subr	Fri Aug 19 10:23:26 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.177 2016/08/16 01:05:19 mrg Exp $
+#	$NetBSD: sets.subr,v 1.178 2016/08/19 10:23:26 mrg Exp $
 #
 
 #
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.177 2016/08/16 01:05:19 mrg Exp $
+# 	# $NetBSD: sets.subr,v 1.178 2016/08/19 10:23:26 mrg Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -349,10 +349,8 @@ list_set_files()
 				if ("gdb" in wanted)
 					wanted["gdb=" "'"${HAVE_GDB}"'"] = 1
 			}
-			if ("'"${MKXORG_SERVER}"'" != "no") {
-				if ("xorg_server_ver" in wanted) {
-					wanted["xorg_server_ver=" "'"${HAVE_XORG_SERVER_VER}"'"] = 1
-				}
+			if ("xorg_server_ver" in wanted) {
+				wanted["xorg_server_ver=" "'"${HAVE_XORG_SERVER_VER}"'"] = 1
 			}
 			if (("man" in wanted) && ("catpages" in wanted))
 				wanted[".cat"] = 1

Reply via email to