[Libreoffice-commits] .: Branch 'libreoffice-3-5' - solenv/gbuild

[Jan Holesovsky]

 solenv/gbuild/CustomTarget.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 73093b588767ad3f2ea73e8be3246e33ae43b3c0
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Dec 13 11:18:03 2011 +0100

    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.

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 0a278d4..41b23b8 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))