summaryrefslogtreecommitdiff
path: root/ure/Package_install.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-08-10 19:41:24 +0300
committerTor Lillqvist <tml@collabora.com>2014-08-10 19:43:32 +0300
commit8e9487cf97d944b202d4406561b88068aaf8e386 (patch)
tree0da6585cb3aa16abc4aac0db5c337accced657f5 /ure/Package_install.mk
parent5b9509115bd4adc5ef2618f0d9436cda1c0d9fbe (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
Diffstat (limited to 'ure/Package_install.mk')
-rw-r--r--ure/Package_install.mk2
1 files changed, 1 insertions, 1 deletions
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: