[Libreoffice-commits] .: 3 commits - i18npool/source solenv/gbuild

[Tor Lillqvist]

 i18npool/source/localedata/Makefile |    4 ++--
 solenv/gbuild/gbuild_simple.mk      |    2 +-
 solenv/gbuild/platform/winmingw.mk  |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 430dcc951ebe912694350c344d9835dbb42e03b6
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 23 00:42:41 2011 +0300

    Obey TMPDIR if set

diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index e36a8ea..d4af631 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -33,7 +33,7 @@ COM := GCC
 ifeq ($(OS_FOR_BUILD),WNT)
 gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp))
 else
-gb_TMPDIR:=/tmp
+gb_TMPDIR:=$(if $(TMPDIR),$(TMPDIR),/tmp)
 endif
 gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
 
commit 20c82c0688d56d116558b9794ea5d13e4902493f
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 23 00:40:29 2011 +0300

    Look at COM to detect MinGW, not the weird USE_MINGW

diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index a84e234..18d1e07 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -83,7 +83,7 @@ include $(GBUILDDIR)/Helper.mk
 ifeq ($(OS),LINUX)
 include $(GBUILDDIR)/platform/linux.mk
 else ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
+ifeq ($(COM),GCC)
 include $(GBUILDDIR)/platform/winmingw.mk
 else
 include $(GBUILDDIR)/platform/windows.mk
commit a1f0f63b378cca23be763ae3ce258ef60bdf18eb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Aug 23 00:04:24 2011 +0300

    Fix cross-compilation

diff --git a/i18npool/source/localedata/Makefile b/i18npool/source/localedata/Makefile
index 6bfbbb3..51c6c3a 100755
--- a/i18npool/source/localedata/Makefile
+++ b/i18npool/source/localedata/Makefile
@@ -43,8 +43,8 @@ ifeq ($(OS_FOR_BUILD),WNT)
 		-env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)`cygpath -m $(OUTDIR)/bin`
 else
 	$(gb_Helper_execute)saxparser $* $< $@ \
-		$(my_file)$(WORKDIR)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR)/bin/types.rdb \
-		-env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(OUTDIR)/lib
+		$(my_file)$(WORKDIR_FOR_BUILD)/CustomTarget/i18npool/source/localedata/saxparser.rdb $(OUTDIR_FOR_BUILD)/bin/types.rdb \
+		-env:OOO_INBUILD_SHAREDLIB_DIR=$(my_file)$(OUTDIR_FOR_BUILD)/lib
 endif
 
 saxparser.rdb : saxparser.input