diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
| tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /pyuno | |
| parent | bd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff) | |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/CustomTarget_python_shell.mk | 1 | ||||
| -rw-r--r-- | pyuno/Package_python_scripts_install.mk | 2 | ||||
| -rw-r--r-- | pyuno/zipcore/mac.sh | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/pyuno/CustomTarget_python_shell.mk b/pyuno/CustomTarget_python_shell.mk index bc6d355f7907..a7b48d554cce 100644 --- a/pyuno/CustomTarget_python_shell.mk +++ b/pyuno/CustomTarget_python_shell.mk @@ -30,6 +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 $(filter YES,$(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)),../Frameworks/),g" \ $< > $@ # vim: set noet sw=4 ts=4: diff --git a/pyuno/Package_python_scripts_install.mk b/pyuno/Package_python_scripts_install.mk index 49df61503a11..6a68a3b6437f 100644 --- a/pyuno/Package_python_scripts_install.mk +++ b/pyuno/Package_python_scripts_install.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,pyuno_python_scripts_install,$(SRCDIR)/pyuno/so $(eval $(call gb_Package_set_outdir,pyuno_python_scripts_install,$(INSTDIR))) -$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,$(gb_PROGRAMDIRNAME),\ +$(eval $(call gb_Package_add_files,pyuno_python_scripts_install,$(LIBO_LIB_PYUNO_FOLDER),\ loader/pythonloader.py \ module/uno.py \ module/unohelper.py \ diff --git a/pyuno/zipcore/mac.sh b/pyuno/zipcore/mac.sh index 7543e6d3f31f..9f04b99a3157 100644 --- a/pyuno/zipcore/mac.sh +++ b/pyuno/zipcore/mac.sh @@ -1,4 +1,4 @@ -PYTHONHOME=$sd_prog/LibreOfficePython.framework +PYTHONHOME=$sd_prog/%%PYTHON_FRAMEWORK_RELATIVE_PATH%%LibreOfficePython.framework export PYTHONHOME pybasislibdir=$PYTHONHOME/Versions/%%PYVERSION%%/lib/python%%PYVERSION%% |