You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2019/04/04 11:28:00 UTC
svn commit: r1856916 -
/openoffice/trunk/main/scp2/source/ooo/module_systemint.scp
Author: jim
Date: Thu Apr 4 11:28:00 2019
New Revision: 1856916
URL: http://svn.apache.org/viewvc?rev=1856916&view=rev
Log:
Merge r1856914 from trunk:
Reviewed by: jim
Modified:
openoffice/trunk/main/scp2/source/ooo/module_systemint.scp
Modified: openoffice/trunk/main/scp2/source/ooo/module_systemint.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/module_systemint.scp?rev=1856916&r1=1856915&r2=1856916&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/module_systemint.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/module_systemint.scp Thu Apr 4 11:28:00 2019
@@ -36,7 +36,14 @@ Module gid_Module_Optional_Systemintegra
#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 = "";