[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - postprocess/Rdb_services.mk scp2/Module_scp2.mk scripting/Module_scripting.mk

[Andras Timar]

 postprocess/Rdb_services.mk   |    4 +++-
 scp2/Module_scp2.mk           |    4 +++-
 scripting/Module_scripting.mk |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 8c81c4059ec29eabfa7a4b2b7d3b00adca7bf039
Author: Andras Timar <andras.timar at collabora.com>
Date:   Tue May 12 18:37:26 2015 +0200

    build fixes for --disable-python option
    
    Change-Id: I57ecd757f0f39d533129eda566f5e13751b25a0f

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 06906d9..72a31bb 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -168,7 +168,9 @@ $(eval $(call gb_Rdb_add_components,services,\
 		scripting/source/basprov/basprov \
 		scripting/source/dlgprov/dlgprov \
 		scripting/source/protocolhandler/protocolhandler \
-		scripting/source/pyprov/mailmerge \
+		$(if $(filter TRUE,$(DISABLE_PYTHON)),,\
+			scripting/source/pyprov/mailmerge \
+		) \
 		wizards/com/sun/star/wizards/fax/fax \
 		wizards/com/sun/star/wizards/letter/letter \
 		wizards/com/sun/star/wizards/agenda/agenda \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index be02cd8..3720386 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -22,7 +22,9 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	InstallModule_math \
 	InstallModule_onlineupdate \
 	InstallModule_ooo \
-	InstallModule_python \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,\
+		InstallModule_python \
+	) \
 	InstallModule_ure \
 	InstallModule_writer \
 	InstallModule_xsltfilter \
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index de90fe7..fffa925 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -40,7 +40,9 @@ $(eval $(call gb_Module_add_targets,scripting,\
 	Library_scriptframe \
 	Library_stringresource \
 	Library_vbaevents \
-	Pyuno_mailmerge \
+	$(if $(filter TRUE,$(DISABLE_PYTHON)),,\
+		Pyuno_mailmerge \
+	) \
 ))
 
 endif