[Libreoffice-commits] .: instsetoo_native/util

[Tor Lillqvist]

 instsetoo_native/util/makefile.mk |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit dd854e5027d3cf66c6a87a51bf0d429d9550040b
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Aug 31 11:33:48 2011 +0300

    Do run make_installer.pl also for WNTGCC (making an "archive")

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 5301105..6880750 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -42,6 +42,11 @@ PYTHONPATH:=$(PWD)$/$(BIN):$(SOLARLIBDIR):$(SOLARLIBDIR)$/python:$(SOLARLIBDIR)$
 .ENDIF			# "$(GUI)"=="WNT"
 .EXPORT: PYTHONPATH
 
+.IF "$(OS)$(COM)" == "WNTGCC"
+# i.e. cross-compiling
+FORCE2ARCHIVE=TRUE
+.ENDIF
+
 ENABLE_DOWNLOADSETS*=TRUE
 
 .EXPORT: ENABLE_DOWNLOADSETS
@@ -79,13 +84,9 @@ allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j
 xxxx:
     echo $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml
 
-.IF ( "$(GUI)"!="WNT" && "$(EPM)"=="NO" ) || ( "$(CROSS_COMPILING)"=="YES" && "$(GUI)$(COM)"=="WNTGCC" )
+.IF "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 ALLTAR  : $(LOCALPYFILES)
-.IF "$(GUI)$(COM)"=="WNTGCC"
-    @echo "MinGW cross-compilation: unable to create installation set yet"
-.ELSE
     @echo "No EPM: do no packaging at this stage"
-.ENDIF
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO"
 .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"