scp2/source/ooo/module_systemint.scp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
New commits:
commit d06353475daf23b5afdaabf6784e0b7c26e8e350
Author: Jim Jagielski <j...@apache.org>
AuthorDate: Thu Apr 4 11:28:00 2019 +0000
Commit: Jim Jagielski <j...@apache.org>
CommitDate: Thu Apr 4 11:28:00 2019 +0000
Merge r1856914 from trunk:
Reviewed by: jim
diff --git a/scp2/source/ooo/module_systemint.scp
b/scp2/source/ooo/module_systemint.scp
index 684febdea109..dcb87b7130f3 100644
--- a/scp2/source/ooo/module_systemint.scp
+++ b/scp2/source/ooo/module_systemint.scp
@@ -36,7 +36,14 @@ Module gid_Module_Optional_Systemintegration
#else
Styles =
(SYSTEMMODULE,NOTRELOCATABLE,DONTSHOWINUSERINSTALL,INSTALLCANFAIL,USEFORCE);
#endif
- #if (defined(LINUX)) || (defined(SOLARIS))
+/*
+ * Hardcode name as 'openoffice' to handle Beta and Dev builds which
+ * would result in openoffice_beta, for example.
+ * See sysui/desktop/productversion.mk
+ */
+ #if (defined(LINUX))
+ PackageName = "openoffice-desktop-integration.tar.gz";
+ #elif (defined(SOLARIS))
PackageName = "${SYSTEMINTUNIXPACKAGENAME}-desktop-integration.tar.gz";
#else
PackageName = "";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
