diff options
| author | Andras Timar <andras.timar@collabora.com> | 2020-07-28 21:11:54 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-07-29 10:09:35 +0200 |
| commit | d96bd78a1cb4bf102a01a61f5bc27a0e8bae2d5c (patch) | |
| tree | 82ba3dce2993f633f5db3248caa9ffb63a0d9dde | |
| parent | 5eeb1a9daf3c69da8b3d3f41d095195af871dfb6 (diff) | |
[cp] fix MSI signing
co-6.4-2
Change-Id: I5451dd451043207d72a8e917fbfbcd0903106599
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index 7de17d582427..21535d4fe39f 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -152,8 +152,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_main_signing.do $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH) \ - $(WORKDIR)/installation/$(PRODUCTNAME)/msi/install/*/*.msi \ + -d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)-$(LIBO_VERSION_PATCH) \ + $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)/msi/install/*/*.msi \ && touch $@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signing.done: @@ -164,8 +164,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_helppack_signin $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ Helppack \ - $(WORKDIR)/installation/$(PRODUCTNAME)_helppack/msi/install/*/*.msi \ + -d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)-$(LIBO_VERSION_PATCH)\ Helppack \ + $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_helppack/msi/install/*/*.msi \ && touch $@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.done: @@ -176,8 +176,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/install)/msi_sdk_signing.don $(if $(PFXFILE),-f $(PFXFILE)) \ $(if $(PFXPASSWORD),-p $(PFXPASSWORD)) \ $(if $(TIMESTAMPURL),-t $(TIMESTAMPURL)) \ - -d $(PRODUCTNAME)\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)\ SDK \ - $(WORKDIR)/installation/$(PRODUCTNAME)_SDK/msi/install/*/*.msi \ + -d Collabora\ Office\ $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR)-$(LIBO_VERSION_PATCH)\ SDK \ + $(WORKDIR)/installation/$(PRODUCTNAME_no_spaces)_SDK/msi/install/*/*.msi \ && touch $@ # vim: set noet sw=4 ts=4: |