[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_install.mk

[Tor Lillqvist]

 instsetoo_native/CustomTarget_install.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8186a4a1e478f5f869443d2c34d06877433e444c
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri May 17 13:42:42 2013 +0300

    Check for ODK in BUILD_TYPE
    
    Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9

diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk
index 4a94395..0962ac8 100644
--- a/instsetoo_native/CustomTarget_install.mk
+++ b/instsetoo_native/CustomTarget_install.mk
@@ -105,12 +105,14 @@ ifeq (TRUE,$(LIBO_DEV_INSTALL))
 	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip
 	mv $(DEVINSTALLDIR)/LibreOffice*_archive/* $(DEVINSTALLDIR)/opt
 	rmdir $(DEVINSTALLDIR)/LibreOffice*_archive
+ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))
 	$(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive)
 	unzip -q -d $(DEVINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip
 	mv $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \
         $(DEVINSTALLDIR)/opt/
 	rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK
 	rmdir $(DEVINSTALLDIR)/LibreOffice*_archive_sdk
+endif
 else # LIBO_DEV_INSTALL
 	$(call instsetoo_native_install_command,openoffice,$(if $(filter WNT,$(OS)),$(instsetoo_native_WITH_LANG),en-US),,,$(PKGFORMAT))
 ifeq (ODK,$(filter ODK,$(BUILD_TYPE)))