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

[Jan Holesovsky]

 solenv/gbuild/gbuild.mk                 |    2 +-
 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9c4d6da729a882f1e5ddfb48e2fad7495449ff0b
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Thu Dec 8 23:55:45 2011 +0100

    i18npool on Windows needed more fixes.

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index e85ed83..256261c 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -311,7 +311,7 @@ gb_XSLTPROCTARGET :=
 gb_XSLTPROC := xsltproc
 else
 gb_XSLTPROCTARGET := $(call gb_Executable_get_target_for_build,xsltproc)
-gb_XSLTPROC := $(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
+gb_XSLTPROC := $$(gb_Helper_set_ld_path) $(gb_XSLTPROCTARGET)
 endif
 
 ifeq ($(SYSTEM_PYTHON),YES)
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 809d83c..5f8fb1c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -256,7 +256,7 @@ R=$(gb_Helper_REPODIR_NATIVE) && $(subst $(REPODIR)/,$$R/,$(subst $(gb_Helper_RE
 $(subst $(REPODIR)/,$$R/,$(subst $(SRCDIR)/,$$S/,$(subst $(OUTDIR)/,$$O/,$(subst $(WORKDIR)/,$$W/,$(subst $(gb_Helper_REPODIR_NATIVE)/,$$R/,$(subst $(gb_Helper_SRCDIR_NATIVE)/,$$S/,$(subst $(gb_Helper_OUTDIR_NATIVE)/,$$O/,$(subst $(gb_Helper_WORKDIR_NATIVE)/,$$W/,$(1)))))))))
 endef
 
-gb_Helper_set_ld_path := PATH=\"$${PATH}:$(OUTDIR)/bin\"
+gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 
 # convert parameters filesystem root to native notation
 # does some real work only on windows, make sure not to