summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-12-13 11:18:03 +0100
committerJan Holesovsky <kendy@suse.cz>2011-12-13 11:20:50 +0100
commitddf1cf333174777e7923aa0d6126daf2c8645fed (patch)
treeafe8c40b5c860e9a79763951cd95b22dbb8724cf
parent70c315620e09113026a07982884e8e222973afe5 (diff)
Improve quoting when calling submake for custom targets.
This should fix the Windows build, while keeping the gb_Helper_abbreviate_dirs_native working in custom targets.
-rw-r--r--solenv/gbuild/CustomTarget.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 0a278d4a1a27..41b23b87ad56 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -30,7 +30,8 @@
define gb_CustomTarget__command
+$(call gb_Helper_abbreviate_dirs,\
mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \
- gb_AWK="$(gb_AWK)" gb_XSLTPROC="$(gb_XSLTPROC)" GBUILDDIR="$(GBUILDDIR)" SRCDIR="$(SRCDIR)" \
+ O='$(OUTDIR)' R='$(REPODIR)' S='$(SRCDIR)' W='$(WORKDIR)' gb_AWK='$(gb_AWK)' \
+ gb_XSLTPROC='$(gb_XSLTPROC)' GBUILDDIR='$(GBUILDDIR)' SRCDIR='$(SRCDIR)' \
$(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \
touch $(1))