diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 /tools | |
| parent | 18041138d3169d565755565bdbabd8de596b5ac7 (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 'tools')
| -rw-r--r-- | tools/source/misc/extendapplicationenvironment.cxx | 6 | ||||
| -rw-r--r-- | tools/source/rc/resmgr.cxx | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx index e8b3ff8686b9..33c40ab9cddd 100644 --- a/tools/source/misc/extendapplicationenvironment.cxx +++ b/tools/source/misc/extendapplicationenvironment.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> + #include "sal/config.h" #include <stdlib.h> @@ -70,6 +73,9 @@ void extendApplicationEnvironment() { uri = uri.copy(0, i + 1); } env.append(rtl::Bootstrap::encode(uri)); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + env.append("../" LIBO_SHARE_FOLDER "/"); +#endif env.append(SAL_CONFIGFILE("fundamental")); } OUString envValue(env.makeStringAndClear()); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index d734242ed5ec..cc28f7de6350 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "sal/config.h" #include <cassert> @@ -179,7 +181,7 @@ void ResMgrContainer::init() assert( m_aResFiles.empty() ); // get resource path - OUString uri("$BRAND_BASE_DIR/program/resource/"); + OUString uri("$BRAND_BASE_DIR/" LIBO_SHARE_RESOURCE_FOLDER "/"); rtl::Bootstrap::expandMacros(uri); //TODO: detect failure // collect all possible resource files |