[Libreoffice-commits] .: solenv/gbuild

Matus Kukan mkukan at kemper.freedesktop.org
Mon Jan 16 03:44:01 PST 2012


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

New commits:
commit 9847c3ec4dc276f52fd06b59dd8101506fe84cd9
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Mon Jan 16 12:40:02 2012 +0100

    gbuild: WNT_INTEL_MSC: replace also // with / in the path
    
    Motivation behind this is to fix processing of idl files.
    When LibO directory is toplevel disk directory, there are
    two // in the path which could be the reason idlc fails.

diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index e0d6f12..af59807 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -247,11 +247,12 @@ gb_Helper_set_ld_path := PATH="$${PATH}:$(OUTDIR)/bin"
 # does some real work only on windows, make sure not to
 # break the dummy implementations on unx*
 define gb_Helper_convert_native
+$(subst //,/, \
 $(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


More information about the Libreoffice-commits mailing list