From 63968d2c6e26ff4c0e954bb004613affe70fa7f7 Mon Sep 17 00:00:00 2001 From: jkh Date: Wed, 10 Jun 1998 01:15:46 +0000 Subject: Stop including COMPAT_21 unconditionally for X now; that kludge hasn't been necessary for awhile. --- usr.sbin/sysinstall/dist.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'usr.sbin/sysinstall') diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index c1a7596..63dbad9 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.122 1998/03/09 15:00:48 jkh Exp $ + * $Id: dist.c,v 1.123 1998/03/10 02:37:25 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -197,8 +197,6 @@ distVerifyFlags(void) XF86Dists |= DIST_XF86_SERVER; if (XF86FontDists) XF86Dists |= DIST_XF86_FONTS; - if (XF86Dists) - Dists |= (DIST_XF86 | DIST_COMPAT21); if (isDebug()) msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n", Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists); @@ -265,7 +263,7 @@ distSetXDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; - XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; + XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; XF86FontDists = DIST_XF86_FONTS_MISC; i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self); @@ -306,7 +304,7 @@ distSetXUser(dialogMenuItem *self) distReset(NULL); Dists = _DIST_USER; XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; - XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; + XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86FontDists = DIST_XF86_FONTS_MISC; i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self); distVerifyFlags(); -- cgit v1.1