diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-01-26 13:53:21 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-01-27 11:25:39 +0000 |
| commit | 6fd00998fa63e4f679b4dd00d7a2a7d45f4a30f4 (patch) | |
| tree | 7d26b89c7721f0bbb568ef687e65e1bcc5a76bf2 /instsetoo_native | |
| parent | 3aae650d0f6688eb0c35ec4d36654efe508977da (diff) | |
Put crash directory config in soffice.ini, instead of own ini file
Change-Id: I3a7aa394792c47c6c5a3a553174d177e66ade617
Reviewed-on: https://gerrit.libreoffice.org/33582
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 10 | ||||
| -rw-r--r-- | instsetoo_native/Package_setup.mk | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 73042e3e6bde..2fe644c4bc2f 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -131,7 +131,8 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'SecureUserConfigCompress=true' \ && echo 'SecureUserConfigNumCopies=2' \ && echo 'SecureUserConfigMode=1' \ - && echo 'SecureUserConfigExtensions=true' \ + && echo 'SecureUserConfigExtensions=true' \ + && echo 'CrashDirectory=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/crash' \ ) > $@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,uno) : @@ -145,13 +146,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'UNO_SERVICES=$(if $(filter MACOSX,$(OS)),$${ORIGIN}/../share/misc/,$${ORIGIN}/)services.rdb $${URE_MORE_SERVICES}' \ ) > $@ -$(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,crashreport) : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - ( \ - echo '[CrashReport]' \ - && echo 'CrashDirectory=$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/crash' \ - ) > $@ - .PHONY: $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,version) : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 6ee95dc4d372..5b1e42794532 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -18,7 +18,6 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,soffice) \ $(call gb_Helper_get_rcfile,louno) \ $(call gb_Helper_get_rcfile,version) \ - $(call gb_Helper_get_rcfile,crashreport) \ )) # vim: set noet sw=4 ts=4: |