[Libreoffice-commits] .: solenv/gbuild

Tor Lillqvist tml at kemper.freedesktop.org
Mon Jun 13 03:03:10 PDT 2011


 solenv/gbuild/BuildDirs.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit f46756c3e138cafb4d5cca9b6940097ef47c6402
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon Jun 13 13:01:13 2011 +0300

    Handle also OUTDIR_FOR_BUILD here
    
    Especially, do the cygpath -u dance also for that. Fixes build
    breakage on Windows.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index e2a7819..daa40c1 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -29,6 +29,7 @@
 SOLARINC += $(JDKINCS)
 
 OUTDIR := $(SOLARVERSION)/$(INPATH)
+OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
 WORKDIR := $(SOLARVERSION)/$(INPATH)/workdir
 
 # Override for SetupLocal
@@ -45,6 +46,7 @@ endif
 ifeq ($(OS_FOR_BUILD),WNT)
 override WORKDIR := $(shell cygpath -u $(WORKDIR))
 override OUTDIR := $(shell cygpath -u $(OUTDIR))
+override OUTDIR_FOR_BUILD := $(shell cygpath -u $(OUTDIR_FOR_BUILD))
 override gb_REPOS := $(shell cygpath -u $(gb_REPOS))
 endif
 


More information about the Libreoffice-commits mailing list