diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-08-11 08:10:38 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-08-11 08:15:03 +0300 |
| commit | ad85ce18d3939170e5ef7b1a1f8e5dda2c8aeb9c (patch) | |
| tree | b609c11e7b41b5f57a826aac70345a6b0343078f | |
| parent | 310ed3d39936270f085768726277346c325c900f (diff) | |
"fixes" needed because ure/source/unorc is now expanded at configure time
Argh, this is getting even uglier.
We cheerfully ignore for now the theoretical possibility that the URE
unorc used by build-time tools (i.e. the configure-expanded
ure/source/unorc) could be different for HOST and BUILD (in case they
use different --enable-canonical-installation-tree-structure), and use
the HOST one for the BUILD tools.
The right thing would probably be to construct the URE unorc in the
relevant Makefile, like we do for fundamentalrc? Or then to just
re-design the whole mess of rc files into some simpler (good luck).
Change-Id: I654309503d0e696778910acadcbf2f6b90ffa02a
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | sal/Library_sal.mk | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/Repository.mk b/Repository.mk index e642527e4c58..7d2cac52f409 100644 --- a/Repository.mk +++ b/Repository.mk @@ -739,6 +739,7 @@ endif $(eval $(call gb_Helper_register_packages_for_install,ure,\ ure_install \ + ure_builddir_install \ $(if $(ENABLE_JAVA),\ jvmfwk_javavendors \ jvmfwk_jreproperties \ diff --git a/configure.ac b/configure.ac index a390444d9ee3..7126012bc59d 100644 --- a/configure.ac +++ b/configure.ac @@ -4659,7 +4659,8 @@ if test "$cross_compiling" = "yes"; then instsetoo_native/util/openoffice.lst.in \ config_host/*.in \ sysui/desktop/macosx/Info.plist.in \ - ios/lo.xcconfig.in) \ + ios/lo.xcconfig.in \ + ure/source/unorc.in) \ | (cd CONF-FOR-BUILD && tar xf -) cp configure CONF-FOR-BUILD test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index 122b95f020ad..16c4876eb642 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_defs,sal,\ # need the "ure-link" symlink to exist in INSTDIR so it's possible to link sal # FIXME: this creates cyclic dependency between ure and sal modules $(eval $(call gb_Library_use_package,sal,ure_install)) +$(eval $(call gb_Library_use_package,sal,ure_builddir_install)) $(eval $(call gb_Library_use_libraries,sal,\ $(if $(filter $(OS),ANDROID), \ |