[Libreoffice-commits] .: 2 commits - set_soenv.in solenv/inc
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Jun 8 01:48:28 PDT 2011
set_soenv.in | 4 ++--
solenv/inc/settings.mk | 9 ---------
2 files changed, 2 insertions(+), 11 deletions(-)
New commits:
commit 23d07bc44abf181c4ae6538218dac1a87fc73b7c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Jun 8 11:48:00 2011 +0300
Bye bye hbtoolkit whatever you are
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk
index 6e4551e..317b652 100644
--- a/solenv/inc/settings.mk
+++ b/solenv/inc/settings.mk
@@ -354,10 +354,6 @@ DBG_LEVEL=$(dbglevel)
nodebug=$(NODEBUG)
.ENDIF
-.IF "$(hbtoolkit)"!=""
-HBTOOLKIT=$(hbtoolkit)
-.ENDIF
-
.IF "$(PRODUCT)"!=""
product*=$(PRODUCT)
.ENDIF
@@ -572,11 +568,6 @@ OUT=$(PRJ)/$(OUTPATH).tt
OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).tt
ROUT=$(OUTPATH).tt
.ENDIF
-.IF "$(hbtoolkit)"!=""
-OUT=$(PRJ)/$(OUTPATH).tlk
-OUT_FOR_BUILD=$(PRJ)/$(OUTPATH_FOR_BUILD).tlk
-ROUT=$(OUTPATH).tlk
-.ENDIF
.IF "$(PRJ)"!="."
.IF "$(GUI)"=="WNT"
commit 7f97c3a9c61a9285c097c870ada1ff787b671e36
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Jun 8 11:45:08 2011 +0300
Compare CROSS_COMPILING explicitly to YES
diff --git a/set_soenv.in b/set_soenv.in
index 898494f..b40a34d 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1726,7 +1726,7 @@ if ( '@JDK@' ne '' )
ToFile( "SCPDEFS", '@SCPDEFS@', "e" );
ToFile( "SOLAREXTRAINC", $SOLAREXTRAINC, "e" );
ToFile( "SOLAREXTRALIB", $SOLAREXTRALIB, "e" );
-if ( '@CROSS_COMPILING@' ne '' )
+if ( '@CROSS_COMPILING@' eq 'YES' )
{
# Obviously we shouldn't set PATH to contain host binaries
ToFile( "PATH", "@PATH_FOR_BUILD@", "e" );
@@ -1752,7 +1752,7 @@ ToFile( "STRIP", "@STRIP@", "e" );
ToFile( "WINDRES", "@WINDRES@", "e" );
ToFile( "BUILD_PLATFORM", "@build@", "e" );
ToFile( "HOST_PLATFORM", "@host@", "e" );
-if ( '@CROSS_COMPILING@' ne '' )
+if ( '@CROSS_COMPILING@' eq 'YES' )
{
ToFile( "COM_FOR_BUILD", "@COM_FOR_BUILD@", "e" );
ToFile( "GUI_FOR_BUILD", "@GUI_FOR_BUILD@", "e" );
More information about the Libreoffice-commits
mailing list