Complete switch-over to XF86 3.2.

4 files changed, 10 insertions, 10 deletions

diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index cb28a32..951bfee 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.53 1996/11/04 17:42:04 jkh Exp $
+ * $Id: config.c,v 1.54 1996/11/07 08:03:18 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -357,9 +357,9 @@ configNTP(dialogMenuItem *self)
 int
 configXFree86(dialogMenuItem *self)
 {
-    if (file_executable("/usr/X11R6/bin/xf86config")) {
+    if (file_executable("/usr/X11R6/bin/XF86Setup")) {
 	dialog_clear();
-	systemExecute("/usr/X11R6/bin/xf86config");
+	systemExecute("/usr/X11R6/bin/XF86Setup");
 	return DITEM_SUCCESS | DITEM_RESTORE;
     }
     else {
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index cb28a32..951bfee 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: config.c,v 1.53 1996/11/04 17:42:04 jkh Exp $
+ * $Id: config.c,v 1.54 1996/11/07 08:03:18 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -357,9 +357,9 @@ configNTP(dialogMenuItem *self)
 int
 configXFree86(dialogMenuItem *self)
 {
-    if (file_executable("/usr/X11R6/bin/xf86config")) {
+    if (file_executable("/usr/X11R6/bin/XF86Setup")) {
 	dialog_clear();
-	systemExecute("/usr/X11R6/bin/xf86config");
+	systemExecute("/usr/X11R6/bin/XF86Setup");
 	return DITEM_SUCCESS | DITEM_RESTORE;
     }
     else {
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c
index 742b323..d1c0564 100644
--- a/usr.sbin/sysinstall/dist.c
+++ b/usr.sbin/sysinstall/dist.c
@@ -4,7 +4,7 @@
  * This is probably the last program in the `sysinstall' line - the next
  * generation being essentially a complete rewrite.
  *
- * $Id: dist.c,v 1.74 1996/11/02 19:50:28 jkh Exp $
+ * $Id: dist.c,v 1.75 1996/11/06 19:15:22 jkh Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -75,7 +75,7 @@ static Distribution DistTable[] = {
 { "compat21",	"/",			&Dists,		DIST_COMPAT21,		NULL		},
 { "commerce",	"/usr/local",		&Dists,		DIST_COMMERCIAL,	NULL		},
 { "xperimnt",	"/usr/local",		&Dists,		DIST_EXPERIMENTAL,	NULL		},
-{ "XF86312",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
+{ "XF8632",	"/usr",			&Dists,		DIST_XF86,		XF86DistTable	},
 { NULL },
 };
 
@@ -230,7 +230,7 @@ distSetXUser(dialogMenuItem *self)
 {
     distReset(NULL);
     Dists = _DIST_USER;
-    XF86Dists = DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
+    XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
     XF86ServerDists = DIST_XF86_SERVER_SVGA;
     XF86FontDists = DIST_XF86_FONTS_MISC;
     return distSetXF86(NULL) | distMaybeSetDES(self);
diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h
index cc268f7..c4f6fb0 100644
--- a/usr.sbin/sysinstall/dist.h
+++ b/usr.sbin/sysinstall/dist.h
@@ -27,7 +27,7 @@
 	(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT)
 
 #define _DIST_XDEV \
-	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SET | DIST_XF86_SERVER | DIST_XF86_FONTS)
+	(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SET | DIST_XF86_SET | DIST_XF86_SERVER | DIST_XF86_FONTS)
 
 /* Subtypes for DES distribution */
 #define DIST_DES_DES		0x0001