diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-31 11:33:48 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-31 11:33:48 +0300 |
| commit | dd854e5027d3cf66c6a87a51bf0d429d9550040b (patch) | |
| tree | 1d8293fcab0637146011aac7bbd68e2e770dad5a /instsetoo_native/util | |
| parent | c477ad1858a35a81666debbce66e7fca68b01483 (diff) | |
Do run make_installer.pl also for WNTGCC (making an "archive")
Diffstat (limited to 'instsetoo_native/util')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 5301105020f3..6880750d0de8 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//)" |