diff options
| author | David Tardon <dtardon@redhat.com> | 2013-05-05 15:27:49 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-05 15:47:54 +0200 |
| commit | ed665f24ff62bc00acd41620f91cb9dc458c8a2e (patch) | |
| tree | 04263801afb22fc7b13b088f23608c87792add14 /instsetoo_native | |
| parent | e64e85b2211a10fc6e1584aec2dc199d49d46d79 (diff) | |
copy pyuno files to instdir
Change-Id: I62fa315b942c5b2383ee83c644ecbcbca3d6c40f
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 12 | ||||
| -rw-r--r-- | instsetoo_native/Package_setup.mk | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 366f1a91691a..a669fd594e15 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -11,6 +11,7 @@ $(eval $(call gb_CustomTarget_CustomTarget,instsetoo_native/setup)) $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ ooenv \ + $(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \ ure-link \ versionrc \ )) @@ -31,6 +32,17 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : echo 'export OOO_DISABLE_RECOVERY=1' \ ) > $@ +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/pythonloader.unorc : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + ( \ + echo '[Bootstrap]' && \ + $(if $(filter YES,$(SYSTEM_PYTHON)),\ + echo PYUNO_LOADER_PYTHONPATH='$$ORIGIN',\ + echo PYUNO_LOADER_PYTHONHOME='$$ORIGIN/python-core-$(PYTHON_VERSION)' && \ + echo PYUNO_LOADER_PYTHONPATH='$(foreach dir,lib lib/lib-dynload lib/lib-tk lib/site-packages,$$ORIGIN/python-core-$(PYTHON_VERSION)/$(dir)) $$ORIGIN' \ + ) \ + ) > $@ + $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ure-link : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LN ,1) rm -f $@ && \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 9f8ca3072463..aaba1e51963d 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -13,6 +13,7 @@ $(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR))) $(eval $(call gb_Package_add_files,instsetoo_native_setup,program,\ ooenv \ + $(if $(filter TRUE,$(DISABLE_PYTHON)),,pythonloader.unorc) \ versionrc \ )) |