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 /configure.ac | |
| 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
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
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 |