[Libreoffice-commits] .: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/platform/WNT_INTEL_MSC.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit f727553f3b8c6632d1d374b918221649a9427eac
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Thu Jan 19 22:03:34 2012 +0200

    Don't break file: URLs

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index b7b4e94..7552f09 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -246,13 +246,19 @@ 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
 # break the dummy implementations on unx*
+
+# This file:/// -> file:!!! -> file:/// substitution is to protect the
+# slashes after file: in a file: URL from being unduplicated by the
+# // -> / substitution.
 define gb_Helper_convert_native
+$(subst file:!!!,file:///, \
 $(subst //,/, \
+$(subst file:///,file:!!!, \
 $(subst $(REPODIR),$(gb_Helper_REPODIR_NATIVE), \
 $(subst $(SRCDIR),$(gb_Helper_SRCDIR_NATIVE), \
 $(subst $(WORKDIR),$(gb_Helper_WORKDIR_NATIVE), \
 $(subst $(OUTDIR),$(gb_Helper_OUTDIR_NATIVE), \
-$(1))))))
+$(1))))))))
 endef
 
 # YaccTarget class