diff options
author | Markus Heidelberg <markus.heidelberg@web.de> | 2009-05-17 19:36:53 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2009-06-09 16:37:51 -0400 |
commit | 284026cdfb5a899e558dcb7a36aefaf54a78c094 (patch) | |
tree | 6a03143cbf7727132494cb68a1420940dc5b7d98 /scripts/kconfig/conf.c | |
parent | 8d90c97e46930d01e9394bceb6276c7175136bdc (diff) |
kconfig: do not hardcode ".config" filename
Rather than hardcoding ".config" use conf_get_configname(), which also
respects the environment variable KCONFIG_CONFIG.
This fixes "make silentoldconfig" when KCONFIG_CONFIG is used and also
suggests the given filename for "Load" and "Save as" in qconf.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/kconfig/conf.c')
-rw-r--r-- | scripts/kconfig/conf.c | 7 |
1 files changed, 4 insertions, 3 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 | } |