diff options
| author | Tor Lillqvist <tml@collabora.com> | 2013-09-22 19:59:37 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2013-09-23 00:54:43 +0300 |
| commit | 4c63fd10a548d4e9e1848e2a4d7058cd91ede843 (patch) | |
| tree | eac7091c6fa969ed652f8ae23d775b13a30b2b66 /pyuno | |
| parent | b5fa3764c74047cbee4b825195a8f3b94ba15ffd (diff) | |
Try to fix cross-compilation
Add more FOO_FOR_BUILD variables and some gb_Foo_for_build functions.
Get rid of gb_INSTROOT and gb_DEVINSTALLROOT, just use INSTROOT.
Change-Id: Iee531b02d14fae41edb68ad589a5dec829a60255
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/Package_python_scripts.mk | 2 | ||||
| -rw-r--r-- | pyuno/Package_python_shell.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pyuno/Package_python_scripts.mk b/pyuno/Package_python_scripts.mk index c4fbfdd21869..0a76e0249e92 100644 --- a/pyuno/Package_python_scripts.mk +++ b/pyuno/Package_python_scripts.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,pyuno_python_scripts,$(SRCDIR)/pyuno/source)) -$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,pyuno_python_scripts,$(INSTROOT))) $(eval $(call gb_Package_add_files,pyuno_python_scripts,$(LIBO_LIB_PYUNO_FOLDER),\ loader/pythonloader.py \ diff --git a/pyuno/Package_python_shell.mk b/pyuno/Package_python_shell.mk index 7492be12db08..a986d72900f3 100644 --- a/pyuno/Package_python_shell.mk +++ b/pyuno/Package_python_shell.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,python_shell,$(call gb_CustomTarget_get_workdir,pyuno/python_shell))) -$(eval $(call gb_Package_set_outdir,python_shell,$(gb_INSTROOT))) +$(eval $(call gb_Package_set_outdir,python_shell,$(INSTROOT))) $(eval $(call gb_Package_add_file,python_shell,$(gb_Package_PROGRAMDIRNAME)/python,python.sh)) |