diff options
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 2 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_module.cxx | 2 | ||||
| -rw-r--r-- | pyuno/source/module/pyuno_runtime.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index 6e53993c5438..4cf7f8b6067e 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -30,7 +30,7 @@ $(call gb_CustomTarget_get_workdir,pyuno/python_shell)/os.sh : \ $(SRCDIR)/pyuno/zipcore/$(if $(filter MACOSX,$(OS)),mac,nonmac).sh $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1) sed -e "s/%%PYVERSION%%/$(pyuno_PYTHON_SHELL_VERSION)/g" \ - -e "s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),../Frameworks/),g" \ + -e "s,%%PYTHON_FRAMEWORK_RELATIVE_PATH%%,$(if $(filter MACOSX,$(OS)),../Frameworks/),g" \ $< > $@ # vim: set noet sw=4 ts=4: diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 23800ee0c3be..00e60d9586c1 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -264,7 +264,7 @@ static PyObject* getComponentContext( OUStringBuffer iniFileName; iniFileName.append( path ); -#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE +#ifdef MACOSX iniFileName.appendAscii( "/../" LIBO_ETC_FOLDER ); #endif iniFileName.appendAscii( "/" ); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 9023d3958af3..bda00dedae6a 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -187,7 +187,7 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) reinterpret_cast< oslGenericFunction >(readLoggingConfig), (rtl_uString **) &fileName ); fileName = fileName.copy( fileName.lastIndexOf( '/' )+1 ); -#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE +#ifdef MACOSX fileName += "../" LIBO_ETC_FOLDER "/"; #endif fileName += SAL_CONFIGFILE("pyuno" ); |