[Libreoffice-commits] .: Branch 'libreoffice-3-4' - instsetoo_native/util

[Tor Lillqvist]

 instsetoo_native/util/makefile.mk |    8 ++++++++
 1 file changed, 8 insertions(+)

New commits:
commit 1e8097d33aac2f9dbd964252ee0cc839fdf57674
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Fri Jul 1 16:39:42 2011 +0300

    Build multi-lingual LO and SDK installers for Windows
    
    From instsetoo_native-win32-packaging.diff in the build repo.
    
    Signed-off-by: Tor Lillqvist <tlillqvist at novell.com>

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index d4fa58a..2f0dd9e 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -89,10 +89,18 @@ ALLTAR  : $(LOCALPYFILES)
 .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
 .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+.IF "$(GUI)"=="WNT"
+ALLTAR : openofficeall ooohelppack
+.ELSE
 ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack)
+.ENDIF
+.ELSE
+.IF "$(GUI)"=="WNT"
+ALLTAR : openofficeall ooohelppack sdkooall
 .ELSE
 ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
 .ENDIF
+.ENDIF
 .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
 ALLTAR : updatepack
 .ENDIF			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""