[Libreoffice-commits] .: set_soenv.in solenv/inc

[Tor Lillqvist]

 set_soenv.in           |    4 +++-
 solenv/inc/unitools.mk |    2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e285d9811aec0ef72ecb448c80f586faf01a2154
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Thu Jun 23 01:46:11 2011 +0300

    Don't use FLIPCMD when cross-compiling from Unix

diff --git a/set_soenv.in b/set_soenv.in
index 4be6b15..4378bb8 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -655,7 +655,9 @@ elsif ( $platform =~ m/cygwin|mingw32/ )
   {   print "Setting Windows (MinGW) specific values... ";
       # At the moment this implies the use of tcsh
       # WTF does that mean?
-      $FLIPCMD        = "slfl.pl";
+
+      $FLIPCMD        = "slfl.pl" if '@build_os@' eq 'cygwin';
+
       $PATH_SEPERATOR = ';';
       $PATH_SEPERATOR = ':' if '@build_os@' ne 'cygwin';
       $outfile        = "WindowsMinGWEnv.Set.sh";
diff --git a/solenv/inc/unitools.mk b/solenv/inc/unitools.mk
index 893340e..f28f015 100644
--- a/solenv/inc/unitools.mk
+++ b/solenv/inc/unitools.mk
@@ -87,7 +87,9 @@ COPYUPDATE=-u
 ECHON=echo -n
 ECHONL=echo
 FIND*=find
+.IF "$(OS_FOR_BUILD)"=="WNT"
 FLIPCMD*=$(PERL) $(SOLARENV)/bin/slfl.pl
+.ENDIF
 GNUCOPY*=cp
 GNUMAKE*=make
 GREP*=grep