diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-07-28 18:33:58 +0200 |
| commit | a95376174ec70c4a75569ce6dafacb0f696b21bc (patch) | |
| tree | c1b813dddd1c32efb22913cc3b2f5813e6d901ff /instsetoo_native | |
| parent | edb451c490fe72ced8df20829c7fbc0da93e672c (diff) | |
| parent | 6760b5695c4461126a34a84f64fd7114eff23143 (diff) | |
Merge commit 'libreoffice-3.4.2.3'
Conflicts:
Makefile.in
configure.in
instsetoo_native/util/makefile.mk
instsetoo_native/util/openoffice.lst
ooo.lst.in
set_soenv.in
solenv/inc/minor.mk
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 92be378811fc..8132e8c72cd5 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -85,10 +85,18 @@ ALLTAR : $(LOCALPYFILES) .ELSE # "$(GUI)"!="WNT" && "$(EPM)"=="NO" .IF "$(ENABLE_RELEASE_BUILD)"=="TRUE" .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 .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)" ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) |