strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sb118: independent of PKGFORMAT, always build a default-language openoffice product also in archive format, so that tests that require an OOo installation (like smoketestoo_native) have one available

Browse source
This commit is contained in:
sb 2009-12-18 16:07:38 +01:00
parent 93eb292132
commit 05250e05b0
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
instsetoo_native/util/makefile.mk
View file

@ -122,6 +122,10 @@ PKGFORMAT+=$(MAKETARGETS:e:s/.//)
PKGFORMATSWITCH=-format archive PKGFORMATSWITCH=-format archive
.ELSE # "$(FORCE2ARCHIVE)"!="" .ELSE # "$(FORCE2ARCHIVE)"!=""
PKGFORMATSWITCH=-format xxx PKGFORMATSWITCH=-format xxx
# Independent of PKGFORMAT, always build a default-language openoffice product
# also in archive format, so that tests that require an OOo installation (like
# smoketestoo_native) have one available:
openoffice_$(defaultlangiso) : $$@.archive
.ENDIF # "$(FORCE2ARCHIVE)"!="" .ENDIF # "$(FORCE2ARCHIVE)"!=""
.ENDIF # "$(PKGFORMAT)"!="" .ENDIF # "$(PKGFORMAT)"!=""
@ -229,7 +233,7 @@ $(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
$(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS)
.ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" .ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
.ENDIF # "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!="" .ENDIF # "$(MAKETARGETS)"!="" && "$(PKGFORMAT)"!=""
openoffice_%{$(PKGFORMAT:^".")} : openoffice_%{$(PKGFORMAT:^".") .archive} :
.ELSE # "$(PKGFORMAT)"!="" .ELSE # "$(PKGFORMAT)"!=""
openoffice_% : openoffice_% :
.ENDIF # "$(PKGFORMAT)"!="" .ENDIF # "$(PKGFORMAT)"!=""
@ -350,7 +354,7 @@ openoffice:
.IF "$(PKGFORMAT)"=="" .IF "$(PKGFORMAT)"==""
$(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py $(foreach,i,$(alllangiso) openoffice_$i openofficewithjre_$i openofficedev_$i broffice_$i brofficewithjre_$i brofficedev_$i sdkoo_$i) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
.ELSE # "$(PKGFORMAT)"=="" .ELSE # "$(PKGFORMAT)"==""
$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".")} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py $(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} broffice_$i{$(PKGFORMAT:^".")} brofficewithjre_$i{$(PKGFORMAT:^".")} brofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES) $(BIN)$/cp1251.py $(BIN)$/iso8859_1.py
.ENDIF # "$(PKGFORMAT)"=="" .ENDIF # "$(PKGFORMAT)"==""
.ENDIF # "$(LOCALPYFILES)"!="" .ENDIF # "$(LOCALPYFILES)"!=""