You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2011/12/02 08:52:47 UTC
svn commit: r1209379 -
/incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
Author: jsc
Date: Fri Dec 2 07:52:46 2011
New Revision: 1209379
URL: http://svn.apache.org/viewvc?rev=1209379&view=rev
Log:
fix build breaker in instsetoo_native, removing broffice
Modified:
incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
Modified: incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk?rev=1209379&r1=1209378&r2=1209379&view=diff
==============================================================================
--- incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk (original)
+++ incubator/ooo/trunk/main/instsetoo_native/util/makefile.mk Fri Dec 2 07:52:46 2011
@@ -228,7 +228,6 @@ ure_%{$(PKGFORMAT:^".")} :
-msilanguage $(MISC)$/win_ulffiles
.ENDIF
-$(foreach,i,$(alllangiso)) : $$@{$(PKGFORMAT:^".")}
.IF "$(MAKETARGETS)"!=""
.IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
$(MAKETARGETS) : $$@{$(PKGFORMAT:^".")}
@@ -243,7 +242,7 @@ openoffice:
.ENDIF # "$(alllangiso)"!=""
.IF "$(LOCALPYFILES)"!=""
-$(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)
+$(foreach,i,$(alllangiso) openoffice_$i{$(PKGFORMAT:^".") .archive} openofficewithjre_$i{$(PKGFORMAT:^".")} openofficedev_$i{$(PKGFORMAT:^".")} sdkoo_$i{$(PKGFORMAT:^".")}) updatepack : $(LOCALPYFILES)
.ENDIF # "$(LOCALPYFILES)"!=""
$(BIN)$/%.py : $(SOLARSHAREDBIN)$/pyuno$/%.py
@@ -256,18 +255,6 @@ $(BIN)$/dev$/intro.zip : $(SOLARCOMMONPC
@-$(MKDIR) $(@:d)
$(COPY) $< $@
-$(BIN)$/broffice_dev$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_dev_nologo$/intro.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-$(BIN)$/broffice$/intro.zip : $(SOLARCOMMONPCKDIR)$/broffice_nologo$/intro.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
-$(BIN)$/broffice$/images_brand.zip : $(SOLARCOMMONBINDIR)$/broffice_nologo$/images_brand.zip
- @-$(MKDIR) $(@:d)
- $(COPY) $< $@
-
hack_msitemplates .PHONY:
-$(MKDIRHIER) $(MSIOFFICETEMPLATEDIR)
-$(MKDIRHIER) $(MSILANGPACKTEMPLATEDIR)