aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorJordan K. Hubbard <jkh@FreeBSD.org>1996-07-11 18:37:48 +0000
committerJordan K. Hubbard <jkh@FreeBSD.org>1996-07-11 18:37:48 +0000
commitbd5706a78a33681f26eded12eaa37ab51c58063d (patch)
tree94d6ec3128023d022b2f53805930ab62fb467c7a /release
parent15232ab26e52e2e1c4bbbc627b7fd4368a976818 (diff)
Notes
Diffstat (limited to 'release')
-rw-r--r--release/sysinstall/Makefile7
-rw-r--r--release/sysinstall/dmenu.c4
-rw-r--r--release/sysinstall/menus.c7
3 files changed, 9 insertions, 9 deletions
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index e622cbee558a..4974832d3706 100644
--- a/release/sysinstall/Makefile
+++ b/release/sysinstall/Makefile
@@ -1,7 +1,6 @@
PROG= sysinstall
NOMAN= yes
-CLEANFILES= makedevs.c rtermcap
-DEBUG_FLAGS+= -g3
+CLEANFILES+= makedevs.c rtermcap
.PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
@@ -14,8 +13,8 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \
CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog
-DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
-LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
+DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK}
+LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk
makedevs.c: Makefile rtermcap
rm -f makedevs.tmp
diff --git a/release/sysinstall/dmenu.c b/release/sysinstall/dmenu.c
index bb679a986d59..89f2edde7bb7 100644
--- a/release/sysinstall/dmenu.c
+++ b/release/sysinstall/dmenu.c
@@ -4,7 +4,7 @@
* This is probably the last attempt in the `sysinstall' line, the next
* generation being slated for what's essentially a complete rewrite.
*
- * $Id: dmenu.c,v 1.21 1996/07/02 01:03:39 jkh Exp $
+ * $Id: dmenu.c,v 1.22 1996/07/05 08:35:53 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -171,7 +171,7 @@ menu_height(DMenu *menu, int n)
int max;
char *t;
- for (t = menu->title, max = MAX_MENU; *t; t++) {
+ for (t = menu->prompt, max = MAX_MENU; *t; t++) {
if (*t == '\n')
--max;
}
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index bc12a5eb956b..1b3f18b0a078 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
- * $Id: menus.c,v 1.80 1996/07/08 12:00:43 jkh Exp $
+ * $Id: menus.c,v 1.81 1996/07/10 09:41:09 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -294,7 +294,7 @@ DMenu MenuInitial = {
{ "5 Express", "Begin a quick installation (for the impatient)", NULL, installExpress },
{ "6 Custom", "Begin a custom installation (for experts)", NULL, dmenuSubmenu, NULL, &MenuInstallCustom },
{ "7 Fixit", "Go into repair mode with CDROM or floppy", NULL, dmenuSubmenu, NULL, &MenuFixit },
- { "8 Upgrade", "Upgrade an existing 2.0.5 system", NULL, installUpgrade },
+ { "8 Upgrade", "Upgrade an existing system", NULL, installUpgrade },
{ "9 Configure", "Do post-install configuration of FreeBSD", NULL, dmenuSubmenu, NULL, &MenuConfigure },
{ "0 Index", "Glossary of functions.", NULL, dmenuSubmenu, NULL, &MenuIndex },
{ NULL } },
@@ -626,7 +626,8 @@ These select what we consider to be the most reasonable defaults for the\n\
type of system in question. If you would prefer to pick and choose the\n\
list of distributions yourself, simply select \"Custom\". You can also\n\
pick a canned distribution set and then fine-tune it with the Custom item.\n\n\
-When you are finished chose the Exit item or Cancel to abort.",
+Choose an item by pressing [SPACE]. When you are finished, chose the Exit\n\
+item or press [ENTER].",
"Press F1 for more information on these options.",
"distributions",
{ { "1 Developer", "Full sources, binaries and doc but no games [180MB]",