diff -urN oldtree/Makefile newtree/Makefile --- oldtree/Makefile 2006-03-27 13:28:15.000000000 -0500 +++ newtree/Makefile 2006-03-28 10:35:24.727654500 -0500 @@ -316,7 +316,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNELRELEASE KERNELVERSION \ ARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC \ CPP AR NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS PERL UTS_MACHINE \ - HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS + HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS NAME export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE diff -urN oldtree/scripts/kconfig/confdata.c newtree/scripts/kconfig/confdata.c --- oldtree/scripts/kconfig/confdata.c 2006-03-27 13:28:15.000000000 -0500 +++ newtree/scripts/kconfig/confdata.c 2006-03-28 10:35:24.767657000 -0500 @@ -385,20 +385,22 @@ fprintf(out, _("#\n" "# Automatically generated make config: don't edit\n" - "# Linux kernel version: %s\n" + "# Linux kernel version: %s \"%s\"\n" "%s%s" "#\n"), sym_get_string_value(sym), + getenv("NAME"), use_timestamp ? "# " : "", use_timestamp ? ctime(&now) : ""); if (out_h) fprintf(out_h, "/*\n" " * Automatically generated C config: don't edit\n" - " * Linux kernel version: %s\n" + " * Linux kernel version: %s \"%s\"\n" "%s%s" " */\n" "#define AUTOCONF_INCLUDED\n", sym_get_string_value(sym), + getenv("NAME"), use_timestamp ? " * " : "", use_timestamp ? ctime(&now) : ""); diff -urN oldtree/scripts/kconfig/gconf.c newtree/scripts/kconfig/gconf.c --- oldtree/scripts/kconfig/gconf.c 2006-03-27 13:28:15.000000000 -0500 +++ newtree/scripts/kconfig/gconf.c 2006-03-28 10:35:27.971857250 -0500 @@ -275,8 +275,8 @@ /*"style", PANGO_STYLE_OBLIQUE, */ NULL); - sprintf(title, _("Linux Kernel v%s Configuration"), - getenv("KERNELVERSION")); + sprintf(title, _("Linux Kernel v%s \"%s\" Configuration"), + getenv("KERNELRELEASE"), getenv("NAME")); gtk_window_set_title(GTK_WINDOW(main_wnd), title); gtk_widget_show(main_wnd); diff -urN oldtree/scripts/kconfig/mconf.c newtree/scripts/kconfig/mconf.c --- oldtree/scripts/kconfig/mconf.c 2006-03-27 13:28:15.000000000 -0500 +++ newtree/scripts/kconfig/mconf.c 2006-03-28 10:35:27.979857750 -0500 @@ -1053,8 +1053,8 @@ sym = sym_lookup("KERNELVERSION", 0); sym_calc_value(sym); - sprintf(menu_backtitle, _("Linux Kernel v%s Configuration"), - sym_get_string_value(sym)); + sprintf(menu_backtitle, _("Linux Kernel v%s \"%s\" Configuration"), + sym_get_string_value(sym), getenv("NAME")); mode = getenv("MENUCONFIG_MODE"); if (mode) { diff -urN oldtree/scripts/kconfig/qconf.cc newtree/scripts/kconfig/qconf.cc --- oldtree/scripts/kconfig/qconf.cc 2006-03-27 13:28:15.000000000 -0500 +++ newtree/scripts/kconfig/qconf.cc 2006-03-28 10:35:27.991858500 -0500 @@ -1128,14 +1128,14 @@ if (s.isNull()) return; if (conf_read(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", "Unable to load configuration!"); + QMessageBox::information(this, "QConf Error", "Unable to load configuration!"); ConfigView::updateListAll(); } void ConfigMainWindow::saveConfig(void) { if (conf_write(NULL)) - QMessageBox::information(this, "qconf", "Unable to save configuration!"); + QMessageBox::information(this, "QConf Error", "Unable to save configuration!"); } void ConfigMainWindow::saveConfigAs(void) @@ -1144,7 +1144,7 @@ if (s.isNull()) return; if (conf_write(QFile::encodeName(s))) - QMessageBox::information(this, "qconf", "Unable to save configuration!"); + QMessageBox::information(this, "QConf Error", "Unable to save configuration!"); } void ConfigMainWindow::changeMenu(struct menu *menu) @@ -1280,7 +1280,7 @@ e->accept(); return; } - QMessageBox mb("qconf", "Save configuration?", QMessageBox::Warning, + QMessageBox mb("Save .config?", "Save configuration?", QMessageBox::Warning, QMessageBox::Yes | QMessageBox::Default, QMessageBox::No, QMessageBox::Cancel | QMessageBox::Escape); mb.setButtonText(QMessageBox::Yes, "&Save Changes"); mb.setButtonText(QMessageBox::No, "&Discard Changes"); @@ -1299,7 +1299,8 @@ void ConfigMainWindow::showIntro(void) { - static char str[] = "Welcome to the qconf graphical kernel configuration tool for Linux.\n\n" + static char str[1000]; + sprintf(str, "Welcome to the qconf graphical kernel configuration tool for Linux %s \"%s\".\n\n" "For each option, a blank box indicates the feature is disabled, a check\n" "indicates it is enabled, and a dot indicates that it is to be compiled\n" "as a module. Clicking on the box will cycle through the three states.\n\n" @@ -1309,9 +1310,10 @@ "options must be enabled to support the option you are interested in, you can\n" "still view the help of a grayed-out option.\n\n" "Toggling Show Debug Info under the Options menu will show the dependencies,\n" - "which you can then match by examining other options.\n\n"; + "which you can then match by examining other options.\n\n", + getenv("KERNELRELEASE"), getenv("NAME")); - QMessageBox::information(this, "qconf", str); + QMessageBox::information(this, "Introduction", str); } void ConfigMainWindow::showAbout(void) @@ -1319,7 +1321,7 @@ static char str[] = "qconf is Copyright (C) 2002 Roman Zippel .\n\n" "Bug reports and feature request can also be entered at http://bugzilla.kernel.org/\n"; - QMessageBox::information(this, "qconf", str); + QMessageBox::information(this, "About", str); } void ConfigMainWindow::saveSettings(void) @@ -1387,7 +1389,12 @@ { ConfigMainWindow* v; const char *name; - + static char title[100]; + + sprintf(title,"Linux Kernel %s \"%s\" Configuration", + getenv("KERNELRELEASE"), getenv("NAME") + ); + bindtextdomain(PACKAGE, LOCALEDIR); textdomain(PACKAGE); @@ -1416,6 +1423,7 @@ v = new ConfigMainWindow(); + v->setCaption(title); //zconfdump(stdout); v->show(); configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit())); diff -urN oldtree/scripts/kconfig/zconf.tab.c_shipped newtree/scripts/kconfig/zconf.tab.c_shipped --- oldtree/scripts/kconfig/zconf.tab.c_shipped 2006-03-27 13:28:15.000000000 -0500 +++ newtree/scripts/kconfig/zconf.tab.c_shipped 2006-03-28 10:35:27.999859000 -0500 @@ -1943,13 +1943,14 @@ { struct symbol *sym; int i; - + static char title[100]; zconf_initscan(name); - + sprintf(title,"Linux Kernel %s \"%s\" Configuration", + getenv("KERNELRELEASE"), getenv("NAME")); sym_init(); menu_init(); modules_sym = sym_lookup("MODULES", 0); - rootmenu.prompt = menu_add_prompt(P_MENU, "Linux Kernel Configuration", NULL); + rootmenu.prompt = menu_add_prompt(P_MENU, title, NULL); #if YYDEBUG if (getenv("ZCONF_DEBUG"))