[Libreoffice-commits] core.git: Branch 'feature/calc-group-interpreter' - scp2/Module_scp2.mk

Michael Meeks michael.meeks at suse.com
Wed May 15 04:32:41 PDT 2013


 scp2/Module_scp2.mk |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 0f09da85bacb8f688e26db074ca53d4e9ee6c0fa
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Wed May 15 11:24:29 2013 +0100

    scp2: only package the sdk if it is enabled.
    
    Change-Id: Id5798c97d3dcfd997ce56f7a7ea72660c9b86c63

diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 5bccae0..9dc1cb6 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -30,14 +30,16 @@ $(eval $(call gb_Module_add_targets,scp2,\
 	InstallModule_onlineupdate \
 	InstallModule_ooo \
 	InstallModule_python \
-	InstallModule_sdkoo \
 	InstallModule_smoketest \
 	InstallModule_ure \
 	InstallModule_writer \
 	InstallModule_xsltfilter \
-	InstallScript_sdkoo \
 	InstallScript_setup_osl \
 	InstallScript_test \
+	$(if $(filter ODK,$(BUILD_TYPE)), \
+		InstallModule_sdkoo \
+		InstallScript_sdkoo \
+	) \
 	$(if $(filter WNT,$(OS)),\
 		InstallModule_activex \
 		InstallModule_quickstart \


More information about the Libreoffice-commits mailing list