Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@xxxxxxxxxxxx> --- common/Makefile | 8 +++++--- scripts/genenv | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/common/Makefile b/common/Makefile index 8b8686d..14f8643 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 6a833b1..de8b4f1 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 -- 1.7.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
