[Libreoffice-commits] .: solenv/gbuild

Kohei Yoshida kohei at kemper.freedesktop.org
Fri Dec 2 18:30:50 PST 2011


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

New commits:
commit c53c81d97eca4fd3f9a6957ed8b3988a61391da7
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Fri Dec 2 21:25:49 2011 -0500

    Revert "Don't overwrite OUTDIR & friends." once again....
    
    This reverts commit 0f1b0e5b7ad813069630e7ae719a800ecab640a8.

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 828546f..6a0933b 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -35,6 +35,15 @@ ifeq ($(strip $(SOLARENV)),)
 $(error SOLARENV variable is empty, no environment set, aborting)
 endif
 
+# HACK
+# unixify windoze paths
+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 SRCDIR := $(shell cygpath -u $(SRCDIR))
+endif
+
 REPODIR := $(patsubst %/,%,$(dir $(SRCDIR)))
 
 # vim: set noet sw=4:


More information about the Libreoffice-commits mailing list