diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-07-11 14:37:26 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-07-11 14:37:26 +0000 |
| commit | 54f3801137750b62442d174ce53324a3b30ff2aa (patch) | |
| tree | be7614847041f3aa389647a0b57aa88177d9f0d0 /instsetoo_native/util | |
| parent | a7d1d82a099480edbf5c110a2fb8d633c1ce111a (diff) | |
INTEGRATION: CWS ause030 (1.28.16); FILE MERGED
2005/06/16 10:15:25 hjs 1.28.16.2: #123620# simplify
2005/06/14 10:34:56 hjs 1.28.16.1: #123620# remove obsolete remains of OOo 1.1.x
Diffstat (limited to 'instsetoo_native/util')
| -rw-r--r-- | instsetoo_native/util/makefile.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 6ab300c7d21e..6c5d771da0e2 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -128,24 +128,19 @@ updatepack: .IF "$(alllangiso)"!="" +openoffice: $(foreach,i,$(alllangiso) openoffice_$i) + MSIOFFICETEMPLATESOURCE=$(PRJ)$/inc_openoffice$/windows$/msi_templates MSILANGPACKTEMPLATESOURCE=$(PRJ)$/inc_ooolangpack$/windows$/msi_templates .IF "$(BUILD_SPECIAL)"!="" MSIOFFICETEMPLATEDIR=$(MSIOFFICETEMPLATESOURCE) MSILANGPACKTEMPLATEDIR=$(MSILANGPACKTEMPLATESOURCE) -.IF "$(OOO_RELEASE_BUILD)"=="" -openoffice: openoffice_en-US -.ELSE -openoffice: $(foreach,i,$(alllangiso) openoffice_$i) -.ENDIF .ELSE # "$(BUILD_SPECIAL)"!="" NOLOGOSPLASH:=$(BIN)$/intro.bmp MSIOFFICETEMPLATEDIR=$(MISC)$/openoffice$/msi_templates MSILANGPACKTEMPLATEDIR=$(MISC)$/ooolangpack$/msi_templates - ADDDEPS=$(NOLOGOSPLASH) hack_msitemplates -openoffice: $(foreach,i,$(alllangiso) openoffice_$i) $(foreach,i,$(alllangiso) openoffice_$i) : $(ADDDEPS) openofficewithjre: $(foreach,i,$(alllangiso) openofficewithjre_$i) |