[Libreoffice-commits] core.git: desktop/Module_desktop.mk Repository.mk

[Rene Engelhard]

 Repository.mk             |    2 +-
 desktop/Module_desktop.mk |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 691105cb718591fd8e7b78a44e527ba62c997a09
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Mar 28 22:39:12 2016 +0200

    don't build/install minidump_upload with ENABLE_BREAKPAD=
    
    Change-Id: I0f7d9811d669c2884b0c1704878678b01529e52f

diff --git a/Repository.mk b/Repository.mk
index fc550d1..858be89 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -89,7 +89,7 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
 ))
 
 $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
-	minidump_upload \
+	$(call gb_Helper_optional,BREAKPAD,minidump_upload) \
 	$(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
 	soffice_bin \
 	$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 619c060..430d48f 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -34,7 +34,7 @@ ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,desktop,\
     Executable_soffice_bin \
     Executable_unopkg_bin \
-    Executable_minidump_upload \
+    $(if $(ENABLE_BREAKPAD),Executable_minidump_upload) \
     Library_migrationoo2 \
     Library_migrationoo3 \
     Library_unopkgapp \