summaryrefslogtreecommitdiffstats
path: root/package/config/confdata.c
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2009-08-03 10:22:52 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2009-08-03 10:22:52 +0200
commit5e93ac894852e0d70f9a45b94627cb434ae17269 (patch)
treefcd4f69bea2bc64e3a08e45f836ea4e4939d9a39 /package/config/confdata.c
parentefc3aed18132586ad90b0e2bd91dd215633a9b16 (diff)
parentc0727fd3192dd3f126b9534174b4f529eeda2a33 (diff)
downloadbuildroot-novena-5e93ac894852e0d70f9a45b94627cb434ae17269.tar.gz
buildroot-novena-5e93ac894852e0d70f9a45b94627cb434ae17269.zip
Merge branch 'oldconfig-fix' of git://git.busybox.net/~tpetazzoni/git/buildroot
Diffstat (limited to 'package/config/confdata.c')
-rw-r--r--package/config/confdata.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/package/config/confdata.c b/package/config/confdata.c
index 56bcd8769..52199123a 100644
--- a/package/config/confdata.c
+++ b/package/config/confdata.c
@@ -44,9 +44,7 @@ const char *conf_get_configname(void)
const char *conf_get_autoconfig_name(void)
{
- char *name = getenv("BUILDROOT_AUTOCONFIG");
-
- return name ? name : "$(BR2_DEPENDS_DIR)/config/auto.conf";
+ return getenv("KCONFIG_AUTOCONFIG");
}
static char *conf_expand_value(const char *in)