[Libreoffice-commits] core.git: Branch 'aoo/trunk' - instsetoo_native/util

[Herbert Dürr]

 instsetoo_native/util/makefile.mk |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit bca5a8e8e53830c59aeb283a4fdbde8b2bb472e8
Author: Herbert Dürr <hdu at apache.org>
Date:   Thu Dec 12 17:38:18 2013 +0000

    #i123532# avoid build breaker when pkgformat contains an "archive" target
    
    If the configure option --with-package-format contains an "archive" target
    then instset_native makefile.mk has two build targets with the same name.
    This breaks the build. The temporary fix here disables the second recipe
    to allow the buildbots to work again.

diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index e084559..0988ebd0 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -259,14 +259,14 @@ $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openoffice_$L.$P)) .PHO
         $(PRJ)$/util$/update.xml	\
         > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
-$(foreach,L,$(alllangiso) openoffice_$L.archive) :
-    $(MAKE_INSTALLER_COMMAND) 		\
-        -p Apache_OpenOffice		\
-        -msitemplate $(MSIOFFICETEMPLATEDIR)
-    $(GEN_UPDATE_INFO_COMMAND)		\
-        --product Apache_OpenOffice	\
-        $(PRJ)$/util$/update.xml	\
-        > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+#$(foreach,L,$(alllangiso) openoffice_$L.archive) :
+#	$(MAKE_INSTALLER_COMMAND) 		\
+#		-p Apache_OpenOffice		\
+#		-msitemplate $(MSIOFFICETEMPLATEDIR)
+#	$(GEN_UPDATE_INFO_COMMAND)		\
+#		--product Apache_OpenOffice	\
+#		$(PRJ)$/util$/update.xml	\
+#		> $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
 
 #openofficewithjre_%{$(PKGFORMAT:^".")} :
 $(foreach,P,$(PACKAGE_FORMATS) $(foreach,L,$(alllangiso) openofficewithjre_$L.$P)) .PHONY :