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 /python3 | |
| parent | fdo#69601: quick fix for wrong cli_cppuhelper.dll in instset (diff) | |
| download | core-4c63fd10a548d4e9e1848e2a4d7058cd91ede843.tar.gz core-4c63fd10a548d4e9e1848e2a4d7058cd91ede843.zip | |
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 'python3')
| -rw-r--r-- | python3/ExternalPackage_python3.mk | 2 | ||||
| -rw-r--r-- | python3/GeneratedPackage_python3.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/python3/ExternalPackage_python3.mk b/python3/ExternalPackage_python3.mk index 6c513090b21a..9448e258c306 100644 --- a/python3/ExternalPackage_python3.mk +++ b/python3/ExternalPackage_python3.mk @@ -9,7 +9,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,python3,python3)) -$(eval $(call gb_ExternalPackage_set_outdir,python3,$(gb_INSTROOT))) +$(eval $(call gb_ExternalPackage_set_outdir,python3,$(INSTROOT))) $(eval $(call gb_ExternalPackage_use_external_project,python3,python3)) diff --git a/python3/GeneratedPackage_python3.mk b/python3/GeneratedPackage_python3.mk index 823407127d06..d8854eb790dd 100644 --- a/python3/GeneratedPackage_python3.mk +++ b/python3/GeneratedPackage_python3.mk @@ -13,6 +13,6 @@ $(eval $(call gb_GeneratedPackage_use_unpacked,python3,python3)) $(eval $(call gb_GeneratedPackage_use_external_project,python3,python3)) -$(eval $(call gb_GeneratedPackage_add_dir,python3,$(gb_INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework)) +$(eval $(call gb_GeneratedPackage_add_dir,python3,$(INSTROOT)/$(if $(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),Frameworks,$(gb_Package_PROGRAMDIRNAME))/LibreOfficePython.framework,LibreOfficePython.framework)) # vim: set noet sw=4 ts=4: |