diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2012-10-20 01:06:25 +0200 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-11-20 11:20:08 +0100 |
| commit | 9a926d4354d84e424e738a6d401328340400331b (patch) | |
| tree | 7b59baf2c6b59eb7dc8157b5ab28f3628aa53de9 | |
| parent | b341f7882f04cc70b7437583f012a8d93fbfb00e (diff) | |
| download | linux-9a926d4354d84e424e738a6d401328340400331b.tar.gz linux-9a926d4354d84e424e738a6d401328340400331b.tar.bz2 linux-9a926d4354d84e424e738a6d401328340400331b.zip | |
kconfig: get CONFIG_ prefix from the environment
Currently, the CONFIG_ prefix is hard-coded in the kconfig frontends
executables. This means that two projects that use kconfig with
different prefixes can not share the same kconfig frontends.
Instead of hard-coding the prefix in the frontends, get it from the
environment, and revert back to hard-coded value if not found.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/kconfig/gconf.c | 2 | ||||
| -rw-r--r-- | scripts/kconfig/lkc.h | 2 | ||||
| -rw-r--r-- | scripts/kconfig/nconf.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c index adc230638c5b..f2bee70e26f4 100644 --- a/scripts/kconfig/gconf.c +++ b/scripts/kconfig/gconf.c @@ -10,6 +10,7 @@ # include <config.h> #endif +#include <stdlib.h> #include "lkc.h" #include "images.c" @@ -22,7 +23,6 @@ #include <string.h> #include <unistd.h> #include <time.h> -#include <stdlib.h> //#define DEBUG diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h index 7aa9db0b2a77..7577a7fbb405 100644 --- a/scripts/kconfig/lkc.h +++ b/scripts/kconfig/lkc.h @@ -41,7 +41,7 @@ extern "C" { #endif static inline const char *CONFIG_prefix(void) { - return CONFIG_; + return getenv( "CONFIG_" ) ?: CONFIG_; } #undef CONFIG_ #define CONFIG_ CONFIG_prefix() diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c index 261f926d8f4b..ce93e879a29c 100644 --- a/scripts/kconfig/nconf.c +++ b/scripts/kconfig/nconf.c @@ -7,6 +7,7 @@ */ #define _GNU_SOURCE #include <string.h> +#include <stdlib.h> #include "lkc.h" #include "nconf.h" |