diff options
-rw-r--r-- | scripts/kconfig/conf.c | 7 | ||||
-rw-r--r-- | scripts/kconfig/qconf.cc | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c index d190092c3b6e..3baaaecd6b13 100644 --- a/scripts/kconfig/conf.c +++ b/scripts/kconfig/conf.c | |||
@@ -498,14 +498,15 @@ int main(int ac, char **av) | |||
498 | conf_parse(name); | 498 | conf_parse(name); |
499 | //zconfdump(stdout); | 499 | //zconfdump(stdout); |
500 | if (sync_kconfig) { | 500 | if (sync_kconfig) { |
501 | if (stat(".config", &tmpstat)) { | 501 | name = conf_get_configname(); |
502 | if (stat(name, &tmpstat)) { | ||
502 | fprintf(stderr, _("***\n" | 503 | fprintf(stderr, _("***\n" |
503 | "*** You have not yet configured your kernel!\n" | 504 | "*** You have not yet configured your kernel!\n" |
504 | "*** (missing kernel .config file)\n" | 505 | "*** (missing kernel config file \"%s\")\n" |
505 | "***\n" | 506 | "***\n" |
506 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" | 507 | "*** Please run some configurator (e.g. \"make oldconfig\" or\n" |
507 | "*** \"make menuconfig\" or \"make xconfig\").\n" | 508 | "*** \"make menuconfig\" or \"make xconfig\").\n" |
508 | "***\n")); | 509 | "***\n"), name); |
509 | exit(1); | 510 | exit(1); |
510 | } | 511 | } |
511 | } | 512 | } |
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 19811fcca6d6..ce7d508c7520 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc | |||
@@ -1448,7 +1448,7 @@ ConfigMainWindow::ConfigMainWindow(void) | |||
1448 | 1448 | ||
1449 | void ConfigMainWindow::loadConfig(void) | 1449 | void ConfigMainWindow::loadConfig(void) |
1450 | { | 1450 | { |
1451 | QString s = QFileDialog::getOpenFileName(".config", NULL, this); | 1451 | QString s = QFileDialog::getOpenFileName(conf_get_configname(), NULL, this); |
1452 | if (s.isNull()) | 1452 | if (s.isNull()) |
1453 | return; | 1453 | return; |
1454 | if (conf_read(QFile::encodeName(s))) | 1454 | if (conf_read(QFile::encodeName(s))) |
@@ -1464,7 +1464,7 @@ void ConfigMainWindow::saveConfig(void) | |||
1464 | 1464 | ||
1465 | void ConfigMainWindow::saveConfigAs(void) | 1465 | void ConfigMainWindow::saveConfigAs(void) |
1466 | { | 1466 | { |
1467 | QString s = QFileDialog::getSaveFileName(".config", NULL, this); | 1467 | QString s = QFileDialog::getSaveFileName(conf_get_configname(), NULL, this); |
1468 | if (s.isNull()) | 1468 | if (s.isNull()) |
1469 | return; | 1469 | return; |
1470 | if (conf_write(QFile::encodeName(s))) | 1470 | if (conf_write(QFile::encodeName(s))) |