Kaydet (Commit) 8e9487cf authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
üst 5b950911
......@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,ure))
$(eval $(call gb_Module_add_targets,ure,\
Package_install \
Package_builddir_install \
Rdb_ure \
# -*- 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:
......@@ -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:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment