diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-09-18 18:07:41 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-18 23:18:46 +0200 |
| commit | 7d5b30b419fb49232f3476d9fb8899fe3754d96d (patch) | |
| tree | 5f67e6c65cd77539660c49e3bd504abd0cbc2af6 /instsetoo_native | |
| parent | f02cef962b4f930eb5637dea1bb9d8c382839286 (diff) | |
Use instsetoo_native-generated uno ini-file for both instdir and instsets
Change-Id: I8aa839fbe621fed798a9d3a33975cbd202fba656
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/Module_instsetoo_native.mk | 1 | ||||
| -rw-r--r-- | instsetoo_native/Package_setup.mk | 4 | ||||
| -rw-r--r-- | instsetoo_native/Package_setup_ure.mk | 16 |
3 files changed, 17 insertions, 4 deletions
diff --git a/instsetoo_native/Module_instsetoo_native.mk b/instsetoo_native/Module_instsetoo_native.mk index ea540ebc6a1b..15662503d3cc 100644 --- a/instsetoo_native/Module_instsetoo_native.mk +++ b/instsetoo_native/Module_instsetoo_native.mk @@ -20,6 +20,7 @@ endif $(eval $(call gb_Module_add_targets,instsetoo_native,\ CustomTarget_setup \ Package_setup \ + Package_setup_ure \ )) # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index 9d44533ba19f..1f41c3d62a7c 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -22,8 +22,4 @@ $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,version) \ )) -$(eval $(call gb_Package_add_files,instsetoo_native_setup,$(LIBO_URE_ETC_FOLDER), \ - $(call gb_Helper_get_rcfile,uno) \ -)) - # vim: set noet sw=4 ts=4: diff --git a/instsetoo_native/Package_setup_ure.mk b/instsetoo_native/Package_setup_ure.mk new file mode 100644 index 000000000000..a0c7216fc1d0 --- /dev/null +++ b/instsetoo_native/Package_setup_ure.mk @@ -0,0 +1,16 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,instsetoo_native_setup_ure,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup))) + +$(eval $(call gb_Package_add_files,instsetoo_native_setup_ure,$(LIBO_URE_ETC_FOLDER), \ + $(call gb_Helper_get_rcfile,uno) \ +)) + +# vim: set noet sw=4 ts=4: |