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 /sal | |
| parent | make install or install-strip hardly make sense on OS X (diff) | |
| download | core-c6a73009747814513ab5a7277c211449c7378870.tar.gz core-c6a73009747814513ab5a7277c211449c7378870.zip | |
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 'sal')
| -rw-r--r-- | sal/rtl/bootstrap.cxx | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index c6a2f74801f8..59529eef9dd9 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> #include "rtl/bootstrap.h" #include "rtl/bootstrap.hxx" @@ -287,6 +289,13 @@ static OUString & getIniFileName_Impl() // append config file suffix fileName += OUString(SAL_CONFIGFILE("")); + +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + // We keep only executables in the MacOS folder, and all + // rc files in LIBO_ETC_FOLDER (typically "Resources"). + sal_Int32 p = fileName.lastIndexOf( "/MacOS/" ); + fileName = fileName.replaceAt( p+1, strlen("MacOS"), LIBO_ETC_FOLDER ); +#endif } #endif |