diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-06-29 22:08:16 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-06-29 22:30:55 +0200 |
| commit | 2e63faa863e1a6b9cd7556978c86c16299eaec43 (patch) | |
| tree | 756e71fd58a6088b7a58d18ff898090cb934290a /instsetoo_native | |
| parent | 5e83f49e5d62587f427ad416f5188ce81506c05b (diff) | |
instsetoo_native: fix building installation sets
... after 39b04ad7cb2e10f32e92d3c9bec57e35f64a3304 started using
PRODUCTNAME but here it was LibreOffice_Dev for mysterious reasons
whereas PRODUCTNAME is LibreOfficeDev so rename for consistency.
Change-Id: Ia5f5a24f405923a7ea1641de65709fbf842df79c
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 6 | ||||
| -rw-r--r-- | instsetoo_native/util/openoffice.lst.in | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 164378339f94..03134ceb562d 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -80,7 +80,7 @@ $(foreach pkgformat,$(5),\ && $(PERL) -w $< \ -f $(BUILDDIR)/instsetoo_native/util/openoffice.lst \ -l $(subst $(WHITESPACE),$(COMMA),$(strip $(2))) \ - -p $(PRODUCTNAME)$(if $(ENABLE_RELEASE_BUILD),,_Dev)$(3) \ + -p $(PRODUCTNAME)$(3) \ -u $(instsetoo_OUT) \ -buildid $(if $(filter deb0 rpm0,$(pkgformat)$(LIBO_VERSION_PATCH)),1,$(LIBO_VERSION_PATCH)) \ $(if $(filter WNT,$(OS)), \ @@ -98,13 +98,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/install.phony: rm -rf $(instsetoo_OUT) ifeq (TRUE,$(LIBO_TEST_INSTALL)) $(call instsetoo_native_install_command,openoffice,en-US,,,archive) - unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)/archive/install/en-US/LibreOffice*_archive.zip + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME)/archive/install/en-US/LibreOffice*_archive.zip mv $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice*/* $(TESTINSTALLDIR)/ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive/LibreOffice* rmdir $(TESTINSTALLDIR)/LibreOffice*_archive ifeq (ODK,$(filter ODK,$(BUILD_TYPE))) $(call instsetoo_native_install_command,sdkoo,en-US,_SDK,,archive) - unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/LibreOffice$(if $(ENABLE_RELEASE_BUILD),,_Dev)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip + unzip -q -d $(TESTINSTALLDIR) $(instsetoo_OUT)/$(PRODUCTNAME)_SDK/archive/install/en-US/LibreOffice*_archive_sdk.zip mv $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK/sdk \ $(TESTINSTALLDIR)/ rmdir $(TESTINSTALLDIR)/LibreOffice*_archive_sdk/LibreOffice*_SDK diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index d05f8ab5db29..f197c3c3e9bc 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -84,7 +84,7 @@ LibreOffice } } -LibreOffice_Dev +LibreOfficeDev { Settings { @@ -176,7 +176,7 @@ LibreOffice_SDK } } -LibreOffice_Dev_SDK +LibreOfficeDev_SDK { Settings { |