diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-10 19:41:24 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-09-23 09:50:23 +0300 |
| commit | 42456b972db31451b9035972a321c7c1b2978ebe (patch) | |
| tree | 9ddc2a6d84d620d69e97a7e2636b34c95920b164 /ure | |
| parent | 40182723bce4d4a69c7d4805f9d13cb39412f477 (diff) | |
Ugly hack to fix build when srcdir!=builddir
The problem is that the ure/source/unorc file is now expanded by the configure
script, and thus exists only in builddir. But a further complication is that
the uno.ini file is in srcdir. This is one way to handle it. Seems to work for
me, let's see what the srcdir!=builddir tinderbox slaves say.
Change-Id: I6fb456cf849ce5077e2c5bd25dc9149096aab241
(cherry picked from commit 8e9487cf97d944b202d4406561b88068aaf8e386)
Diffstat (limited to 'ure')
| -rw-r--r-- | ure/Module_ure.mk | 1 | ||||
| -rw-r--r-- | ure/Package_builddir_install.mk | 16 | ||||
| -rw-r--r-- | ure/Package_install.mk | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk index 88cbc71b31f2..4d8c2c0aeda9 100644 --- a/ure/Module_ure.mk +++ b/ure/Module_ure.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,ure)) $(eval $(call gb_Module_add_targets,ure,\ Package_install \ + Package_builddir_install \ Rdb_ure \ )) diff --git a/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk new file mode 100644 index 000000000000..c109bd47a325 --- /dev/null +++ b/ure/Package_builddir_install.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,ure_builddir_install,$(BUILDDIR)/ure/source)) + +$(eval $(call gb_Package_add_files,ure_builddir_install,$(LIBO_URE_ETC_FOLDER),\ + $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),$(call gb_Helper_get_rcfile,uno)) \ +)) + +# vim:set noet sw=4 ts=4: diff --git a/ure/Package_install.mk b/ure/Package_install.mk index 19f549288f4f..a5460c9c4b31 100644 --- a/ure/Package_install.mk +++ b/ure/Package_install.mk @@ -26,7 +26,7 @@ endif $(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_ETC_FOLDER),\ $(call gb_Helper_get_rcfile,jvmfwk3) \ - $(call gb_Helper_get_rcfile,uno) \ + $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),,$(call gb_Helper_get_rcfile,uno)) \ )) # vim:set noet sw=4 ts=4: |