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 /pyuno/source/module/pyuno_runtime.cxx | |
| 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 'pyuno/source/module/pyuno_runtime.cxx')
| -rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 00252180764f..a7bb1f28dc35 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.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 "pyuno_impl.hxx" #include <osl/thread.h> @@ -175,6 +178,9 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) reinterpret_cast< oslGenericFunction >(readLoggingConfig), (rtl_uString **) &fileName ); fileName = OUString( fileName.getStr(), fileName.lastIndexOf( '/' )+1 ); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + fileName += "../" LIBO_ETC_FOLDER "/"; +#endif fileName += OUString( SAL_CONFIGFILE("pyuno" )); rtl::Bootstrap bootstrapHandle( fileName ); |