diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-10-28 16:08:30 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-10-28 16:09:06 +0100 |
| commit | f924cf3c2203be22631e6a3c631f712558fd8161 (patch) | |
| tree | 7fddaf7414e5232d1ac9c631cdb0d5ca5d3bf09c /instsetoo_native | |
| parent | 658e88c59d2e5303e6388037dcd99a8f218a6960 (diff) | |
Related fdo#70919 Missing instdir redirect ini-file
...makes javaldx re-scan on every start.
Change-Id: Icffc58bbcbc453e6257e57669c73bfbeb31fc07b
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 9 | ||||
| -rw-r--r-- | instsetoo_native/Package_setup.mk | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 6f2c647eb6e1..47a52f1d6082 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -14,6 +14,8 @@ $(eval $(call gb_CustomTarget_register_targets,instsetoo_native/setup,\ $(call gb_Helper_get_rcfile,fundamental) \ $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ + $(call gb_Helper_get_rcfile,redirect))) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ )) @@ -101,6 +103,13 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ '$(foreach dir,/ /lib-dynload /lib-tk /site-packages,$(patsubst %/,%,$$ORIGIN/python-core-$(PYTHON_VERSION)/lib$(dir))) ')))) \ ) > $@ +$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,redirect) : + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + ( \ + echo '[Bootstrap]' \ + && echo 'URE_BOOTSTRAP=$${ORIGIN}/$(call gb_Helper_get_rcfile,fundamental)' \ + ) > $@ + $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 8985f87996c1..24ebae895450 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -16,6 +16,8 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,fundamental) \ $(if $(ENABLE_OOENV),ooenv) \ $(if $(filter TRUE,$(DISABLE_PYTHON)),,$(call gb_Helper_get_rcfile,pythonloader.uno)) \ + $(if $(filter DESKTOP,$(BUILD_TYPE)),$(if $(filter-out MACOSX,$(OS)), \ + $(call gb_Helper_get_rcfile,redirect))) \ $(call gb_Helper_get_rcfile,uno) \ $(call gb_Helper_get_rcfile,version) \ )) |