diff options
| author | jkh <jkh@FreeBSD.org> | 1996-11-09 19:26:01 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1996-11-09 19:26:01 +0000 |
| commit | 1efb28c05204c1adda57ffc066e0f50736035911 (patch) | |
| tree | 6042738f32b49104c4faf01efc9f36a961021c51 /release | |
| parent | d21e76e0ba303fbf5137410dcd94aa5ca47c06e5 (diff) | |
| download | FreeBSD-src-1efb28c05204c1adda57ffc066e0f50736035911.zip FreeBSD-src-1efb28c05204c1adda57ffc066e0f50736035911.tar.gz | |
1. Saner ldconfig path.
2. Choose DIST_XF86_CFG in defaults; XF86Setup isn't happy otherwise.
Diffstat (limited to 'release')
| -rw-r--r-- | release/sysinstall/config.c | 4 | ||||
| -rw-r--r-- | release/sysinstall/dist.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index cac144a..39ca6ec 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.57 1996/11/08 05:38:23 jkh Exp $ + * $Id: config.c,v 1.58 1996/11/09 18:12:12 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -359,7 +359,7 @@ configXFree86(dialogMenuItem *self) { if (file_executable("/usr/X11R6/bin/XF86Setup")) { dialog_clear(); - systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /compat/lib"); + systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); systemExecute("/usr/X11R6/bin/XF86Setup"); return DITEM_SUCCESS | DITEM_RESTORE; } diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index dd4c834..1ad2546 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.76 1996/11/07 15:35:46 jkh Exp $ + * $Id: dist.c,v 1.77 1996/11/07 18:30:53 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -202,7 +202,7 @@ distSetXDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; - XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | 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; XF86FontDists = DIST_XF86_FONTS_MISC; return distSetXF86(NULL) | distMaybeSetDES(self); @@ -230,7 +230,7 @@ distSetXUser(dialogMenuItem *self) { distReset(NULL); Dists = _DIST_USER; - XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | 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; XF86ServerDists = DIST_XF86_SERVER_SVGA; XF86FontDists = DIST_XF86_FONTS_MISC; return distSetXF86(NULL) | distMaybeSetDES(self); |
