From c6a73009747814513ab5a7277c211449c7378870 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tml@iki.fi>
Date: Fri, 16 Aug 2013 11:08:32 +0300
Subject: 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
---
 pyuno/source/loader/pyuno_loader.cxx  | 4 +++-
 pyuno/source/module/pyuno_module.cxx  | 6 ++++++
 pyuno/source/module/pyuno_runtime.cxx | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

(limited to 'pyuno')

diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
index b9b53657ce04..375ea21d4562 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_folders.h>
+
 #include <pyuno/pyuno.hxx>
 
 #include <osl/process.h>
@@ -181,7 +183,7 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c
     {
         OUString pythonPath;
         OUString pythonHome;
-        OUString path( "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("pythonloader.uno" ));
+        OUString path( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("pythonloader.uno" ));
         rtl::Bootstrap::expandMacros(path); //TODO: detect failure
         rtl::Bootstrap bootstrap(path);
 
diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx
index 1e812d1e28b3..fc6868ab70a4 100644
--- a/pyuno/source/module/pyuno_module.cxx
+++ b/pyuno/source/module/pyuno_module.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 <boost/unordered_map.hpp>
@@ -268,6 +271,9 @@ static PyObject* getComponentContext(
 
             OUStringBuffer iniFileName;
             iniFileName.append( path );
+#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
+            iniFileName.appendAscii( "/../" LIBO_ETC_FOLDER );
+#endif
             iniFileName.appendAscii( "/" );
             iniFileName.appendAscii( SAL_CONFIGFILE( "pyuno" ) );
             iniFile = iniFileName.makeStringAndClear();
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 );
 
-- 
cgit