ure/Module_ure.mk | 1 + ure/Package_builddir_install.mk | 16 ++++++++++++++++ ure/Package_install.mk | 2 +- 3 files changed, 18 insertions(+), 1 deletion(-)
New commits: commit 8e9487cf97d944b202d4406561b88068aaf8e386 Author: Tor Lillqvist <[email protected]> Date: Sun Aug 10 19:41:24 2014 +0300 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 diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk index 88cbc71..4d8c2c0 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 0000000..c109bd4 --- /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 19f5492..a5460c9 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: _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
