diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-17 13:42:42 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2013-05-17 13:44:02 +0300 |
| commit | 8186a4a1e478f5f869443d2c34d06877433e444c (patch) | |
| tree | fe59ab1297b26bf39566dca79699c1a9666a05cd /instsetoo_native | |
| parent | 0c5320a63894919bf8dbb424b9ea52836034efde (diff) | |
Check for ODK in BUILD_TYPE
Change-Id: Ia3c5cf74dc88dbb741ea1eac7bbdf0b41617ded9
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 4a94395cb546..0962ac8f0a7e 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))) |