diff options
| -rw-r--r-- | release/sysinstall/config.c | 6 | ||||
| -rw-r--r-- | release/sysinstall/dist.c | 20 | ||||
| -rw-r--r-- | release/sysinstall/dist.h | 2 |
3 files changed, 15 insertions, 13 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index 42395ad9e3eb..37a09f8df686 100644 --- a/release/sysinstall/config.c +++ b/release/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.51.2.62 1998/03/13 11:13:28 jkh Exp $ + * $Id: config.c,v 1.51.2.63 1998/03/23 09:18:30 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -542,8 +542,8 @@ configXEnvironment(dialogMenuItem *self) } else { dialog_clear_norefresh(); - msgConfirm("XFree86 does not appear to be installed! Please install\n" - "The XFree86 distribution before attempting to configure it."); + msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n" + "Please install this before attempting to configure XFree86."); return DITEM_FAILURE | DITEM_RESTORE; } } diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index c5f2faf0d835..b9a79f3aab80 100644 --- a/release/sysinstall/dist.c +++ b/release/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.73.2.46 1998/07/21 05:42:32 jkh Exp $ + * $Id: dist.c,v 1.73.2.47 1998/07/21 06:09:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -197,6 +197,8 @@ distVerifyFlags(void) XF86Dists |= DIST_XF86_SERVER; if (XF86FontDists) XF86Dists |= DIST_XF86_FONTS; + if (XF86Dists || XF86ServerDists || XF86FontDists) + Dists |= DIST_XF86; if (isDebug()) msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n", Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists); @@ -260,13 +262,12 @@ distSetXDeveloper(dialogMenuItem *self) { int i; - distReset(NULL); - Dists = _DIST_DEVELOPER | DIST_XF86; - SrcDists = DIST_SRC_ALL; + i = distSetDeveloper(self); + Dists |= DIST_XF86; 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); + i |= distSetXF86(NULL); distVerifyFlags(); return i; } @@ -301,12 +302,12 @@ distSetXUser(dialogMenuItem *self) { int i; - distReset(NULL); - Dists = _DIST_USER | DIST_XF86; + i = distSetUser(self); + Dists |= DIST_XF86; XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; 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); + i |= distSetXF86(NULL); distVerifyFlags(); return i; } @@ -324,7 +325,7 @@ distSetEverything(dialogMenuItem *self) { int i; - Dists = DIST_ALL; + Dists = DIST_ALL | DIST_XF86; SrcDists = DIST_SRC_ALL; XF86Dists = DIST_XF86_ALL; XF86ServerDists = DIST_XF86_SERVER_ALL; @@ -774,6 +775,7 @@ distExtractAll(dialogMenuItem *self) if (!mediaVerify() || !mediaDevice->init(mediaDevice)) return DITEM_FAILURE; + distVerifyFlags(); dialog_clear_norefresh(); msgNotify("Attempting to install all selected distributions.."); /* Try for 3 times around the loop, then give up. */ diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index c281d4203f95..9418a5cdd013 100644 --- a/release/sysinstall/dist.h +++ b/release/sysinstall/dist.h @@ -85,7 +85,7 @@ #define DIST_XF86_SERVER_9WEP 0x0000800 #define DIST_XF86_SERVER_9WS 0x0001000 #define DIST_XF86_SERVER_9WSN 0x0002000 -#define DIST_XF86_SERVER_8514 0x0004001 +#define DIST_XF86_SERVER_8514 0x0004000 #define DIST_XF86_SERVER_AGX 0x0008000 #define DIST_XF86_SERVER_I128 0x0010000 #define DIST_XF86_SERVER_MACH8 0x0020000 |