diff options
| author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2010-07-21 17:05:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-22 15:49:02 +0200 |
| commit | d879de38e8430eeb9b37b7b6a2ac3341b0b029f7 (patch) | |
| tree | a543e2e0d0bdbc2e5b2f4358fdb6fce77ca3c7a4 | |
| parent | 6ffe2ec8cd37e432fdfc08f71cb9a46767ef1e39 (diff) | |
| download | barebox-d879de38e8430eeb9b37b7b6a2ac3341b0b029f7.tar.gz barebox-d879de38e8430eeb9b37b7b6a2ac3341b0b029f7.tar.xz | |
barebox_default_env: fix out of tree build
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | common/Makefile | 8 | ||||
| -rwxr-xr-x | scripts/genenv | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/common/Makefile b/common/Makefile index 8b8686db1c..14f8643f15 100644 --- a/common/Makefile +++ b/common/Makefile @@ -26,6 +26,8 @@ ENV_FILES := $(shell cd $(srctree); for i in $(CONFIG_DEFAULT_ENVIRONMENT_PATH); endif # ifdef CONFIG_DEFAULT_ENVIRONMENT -include/barebox_default_env.h: $(ENV_FILES) - $(Q)scripts/genenv $(srctree) $(CONFIG_DEFAULT_ENVIRONMENT_PATH) - $(Q)cat barebox_default_env | scripts/bin2c default_environment > $@ +barebox_default_env: $(ENV_FILES) + $(Q)$(srctree)/scripts/genenv $(srctree) $(objtree) $(CONFIG_DEFAULT_ENVIRONMENT_PATH) + +include/barebox_default_env.h: barebox_default_env + $(Q)cat $< | $(objtree)/scripts/bin2c default_environment > $@ diff --git a/scripts/genenv b/scripts/genenv index 6a833b161d..de8b4f138d 100755 --- a/scripts/genenv +++ b/scripts/genenv @@ -1,17 +1,19 @@ #!/bin/bash # Generate the default environment file from a list of directories -# usage: genenv <basedir> <dir>... +# usage: genenv <basedir> <objdir> <dir>... # where <basedir> is the base directory for relative pathes in <dir> +# where <objdir> is the base directory for relative pathes for result +objtree=$2 cd $1 || exit 1 -shift +shift 2 tempdir=$(mktemp -d) for i in $*; do cp -r $i/* $tempdir done -scripts/bareboxenv -s $tempdir barebox_default_env +$objtree/scripts/bareboxenv -s $tempdir $objtree/barebox_default_env rm -r $tempdir |