summaryrefslogtreecommitdiff
path: root/extensions/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-16 11:08:32 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commitc6a73009747814513ab5a7277c211449c7378870 (patch)
tree2adc961b3c83deffcea251c41744f2626e476f38 /extensions/source
parent18041138d3169d565755565bdbabd8de596b5ac7 (diff)
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to use those from <config_folders.h> instead. In normal builds, the end result will not change. Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'extensions/source')
-rw-r--r--extensions/source/nsplugin/source/so_env.cxx10
-rw-r--r--extensions/source/plugin/unx/sysplug.cxx3
-rw-r--r--extensions/source/update/check/updatecheck.cxx3
-rw-r--r--extensions/source/update/check/updateprotocol.cxx8
-rw-r--r--extensions/source/update/feed/updatefeed.cxx3
5 files changed, 17 insertions, 10 deletions
diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx
index b275ad4c7c09..b09f11ceb870 100644
--- a/extensions/source/nsplugin/source/so_env.cxx
+++ b/extensions/source/nsplugin/source/so_env.cxx
@@ -26,6 +26,8 @@
*
************************************************************************/
+#include <config_folders.h>
+
#include "sal/config.h"
#include "nsp_func.hxx"
@@ -179,7 +181,7 @@ int nspluginOOoModuleHook (void** aResult)
char *clobber;
static char realFileName[NPP_PATH_MAX] = {0};
-# define SEARCH_SUFFIX "/program/libnpsoplug"
+# define SEARCH_SUFFIX "/" LIBO_LIB_FOLDER "/libnpsoplug"
if (!(clobber = strstr (libFileName, SEARCH_SUFFIX)))
{
@@ -262,10 +264,10 @@ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const ch
}
realFileName[len] = '\0';
- if (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION)))
+ if (NULL == (pTempZero = strstr(realFileName, "/" LIBO_LIB_FOLDER "/libnpsoplugin" SAL_DLLEXTENSION)))
#else // LINUX
if ((0 > readlink(lnkFileName, realFileName, NPP_PATH_MAX)) ||
- (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION))))
+ (NULL == (pTempZero = strstr(realFileName, "/" LIBO_LIB_FOLDER "/libnpsoplugin" SAL_DLLEXTENSION))))
#endif // LINUX
{
*realFileName = 0;
@@ -334,7 +336,7 @@ const char* findProgramDir()
static char sProgram[NPP_BUFFER_SIZE] = {0};
if (!sProgram[0])
{
- sprintf(sProgram, "%s/program", findInstallDir());
+ sprintf(sProgram, "%s/" LIBO_BIN_FOLDER, findInstallDir());
#ifdef WNT
UnixToDosPath(sProgram);
#endif
diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx
index d7140f1d3fb4..e20caa491c75 100644
--- a/extensions/source/plugin/unx/sysplug.cxx
+++ b/extensions/source/plugin/unx/sysplug.cxx
@@ -26,6 +26,7 @@
*
************************************************************************/
+#include <config_folders.h>
#ifdef AIX
#define _LINUX_SOURCE_COMPAT
@@ -136,7 +137,7 @@ UnxPluginComm::~UnxPluginComm()
bool UnxPluginComm::getPluginappPath(OString * path) {
OSL_ASSERT(path != NULL);
- OUString p("$BRAND_BASE_DIR/program/pluginapp.bin");
+ OUString p("$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/pluginapp.bin");
rtl::Bootstrap::expandMacros(p);
return
(osl::FileBase::getSystemPathFromFileURL(p, p) ==
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 52e0e628d998..782374fec1c9 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_folders.h>
#include "updatecheck.hxx"
@@ -99,7 +100,7 @@ namespace
static inline OUString getBuildId()
{
- OUString aPathVal("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}");
+ OUString aPathVal("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}");
rtl::Bootstrap::expandMacros(aPathVal);
return aPathVal;
}
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index 7ad265189832..7ef271aa1d40 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_folders.h>
+
#include <com/sun/star/xml/xpath/XPathAPI.hpp>
#include "updateprotocol.hxx"
@@ -50,17 +52,17 @@ getBootstrapData(
OUString & rGitID,
OUString & rInstallSetID)
{
- rGitID = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}";
+ rGitID = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}";
rtl::Bootstrap::expandMacros( rGitID );
if ( rGitID.isEmpty() )
return false;
- rInstallSetID = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}";
+ rInstallSetID = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":UpdateID}";
rtl::Bootstrap::expandMacros( rInstallSetID );
if ( rInstallSetID.isEmpty() )
return false;
- OUString aValue( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" );
+ OUString aValue( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":UpdateURL}" );
rtl::Bootstrap::expandMacros( aValue );
if( !aValue.isEmpty() )
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 82e4427283a9..961893055ec3 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_folders.h>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase3.hxx>
@@ -348,7 +349,7 @@ UpdateInformationProvider::UpdateInformationProvider(
}
OUString product(buf.makeStringAndClear());
- OUString aUserAgent( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" );
+ OUString aUserAgent( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" );
rtl::Bootstrap::expandMacros( aUserAgent );
for (sal_Int32 i = 0;;) {