1 files changed, 44 insertions, 22 deletions

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 6d82718..b9cf25f 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -51,3 +51,3 @@ setmod_text[] =
 nohelp_text[] =
-        "There is no help available for this kernel option.\n",
+        "There is no help available for this option.\n",
 load_config_text[] =
@@ -58,3 +58,3 @@ load_config_help[] =
         "\n"
-        "For various reasons, one may wish to keep several different kernel\n"
+        "For various reasons, one may wish to keep several different \n"
         "configurations available on a single machine.\n"
@@ -62,3 +62,3 @@ load_config_help[] =
         "If you have saved a previous configuration in a file other than the\n"
-        "kernel's default, entering the name of the file here will allow you\n"
+        "default, entering the name of the file here will allow you\n"
         "to modify that configuration.\n"
@@ -72,3 +72,3 @@ save_config_help[] =
         "\n"
-        "For various reasons, one may wish to keep different kernel\n"
+        "For various reasons, one may wish to keep different\n"
         "configurations available on a single machine.\n"
@@ -149,2 +149,3 @@ static void cprint_init(void)
 {
+        char *env = getenv("LXDIALOG");
         bufptr = buf;
@@ -154,3 +155,7 @@ static void cprint_init(void)
         child_count = 0;
-        cprint("./scripts/lxdialog/lxdialog");
+        if(env != NULL) {
+                cprint(env);
+        } else {
+                cprint("./scripts/lxdialog/lxdialog");
+        }
         cprint("--backtitle");
@@ -304,7 +309,4 @@ static void build_conf(struct menu *menu)
                                                 indent + 1, ' ', prompt);
-                                } else {
-                                        if (menu->parent != &rootmenu)
-                                                cprint1("   %*c", indent + 1, ' ');
-                                        cprint1("%s  --->", prompt);
-                                }
+                                } else
+                                        cprint1("   %*c%s  --->", indent + 1, ' ', prompt);
 
@@ -375,2 +377,7 @@ static void build_conf(struct menu *menu)
         } else {
+                if (menu == current_menu) {
+                        cprint(":%p", menu);
+                        cprint("---%*c%s", indent + 1, ' ', menu_get_prompt(menu));
+                        goto conf_childs;
+                }
                 child_count++;
@@ -384,3 +391,6 @@ static void build_conf(struct menu *menu)
                                 cprint("t%p", menu);
-                                cprint1("[%c]", val == no ? ' ' : '*');
+                                if (sym_is_changable(sym))
+                                        cprint1("[%c]", val == no ? ' ' : '*');
+                                else
+                                        cprint1("---");
                                 break;
@@ -393,3 +403,6 @@ static void build_conf(struct menu *menu)
                                 }
-                                cprint1("<%c>", ch);
+                                if (sym_is_changable(sym))
+                                        cprint1("<%c>", ch);
+                                else
+                                        cprint1("---");
                                 break;
@@ -402,3 +415,4 @@ static void build_conf(struct menu *menu)
                                 cprint1("%*c%s%s", tmp, ' ', menu_get_prompt(menu),
-                                        sym_has_value(sym) ? "" : " (NEW)");
+                                        (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                                        "" : " (NEW)");
                                 cprint_done();
@@ -408,3 +422,9 @@ static void build_conf(struct menu *menu)
                 cprint1("%*c%s%s", indent + 1, ' ', menu_get_prompt(menu),
-                        sym_has_value(sym) ? "" : " (NEW)");
+                        (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                        "" : " (NEW)");
+                if (menu->prompt->type == P_MENU) {
+                        cprint1("  --->");
+                        cprint_done();
+                        return;
+                }
                 cprint_done();
@@ -447,5 +467,5 @@ static void conf(struct menu *menu)
                         cprint("L");
-                        cprint("Load an Alternate Configuration File");
+                        cprint("    Load an Alternate Configuration File");
                         cprint("S");
-                        cprint("Save Configuration to an Alternate File");
+                        cprint("    Save Configuration to an Alternate File");
                 }
@@ -486,2 +506,4 @@ static void conf(struct menu *menu)
                                         conf_choice(submenu);
+                                else if (submenu->prompt->type == P_MENU)
+                                        conf(submenu);
                                 break;
@@ -746,4 +768,3 @@ int main(int ac, char **av)
         sym_calc_value(sym);
-        sprintf(menu_backtitle, "Opie %s Configuration",
-                sym_get_string_value(sym));
+        sprintf(menu_backtitle, "Build Configuration");
 
@@ -772,7 +793,8 @@ int main(int ac, char **av)
                 printf("\n\n"
-                        "*** End of Opie configuration.\n"
-                        "*** Check the top-level Makefile for additional configuration.\n"
-                        "*** Next, you may run 'make'.\n\n");
+                        "*** End of configuration.\n"
+                        "\n\n");
         } else
-                printf("\n\nYour Opie  configuration changes were NOT saved.\n\n");
+                printf("\n\n"
+                        "Your configuration changes were NOT saved."
+                        "\n\n");