[Libreoffice-commits] core.git: solenv/gbuild

[Tor Lillqvist]

 solenv/gbuild/Gallery.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit daaa6425ba689e69227751d4f4a719c01977ff1e
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Jan 20 13:15:41 2014 +0200

    Make gallery stuff work also for cross-compilation
    
    Galleries are needed in a cross-compilation only when targeting DESKTOP
    platforms, which people don't do very often, so the problem had not been
    noticed for a while.
    
    Change-Id: Ieb0f010505af230db0661f02345ac6ace3b52957

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index a4319fd..82c5e78 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -23,8 +23,8 @@ define gb_Gallery__make_env_args
 		$(call gb_Helper_make_url,$(call gb_ComponentTarget_get_target_for_build,$(item))))" \
 "-env:UNO_TYPES=$(foreach item,offapi udkapi,\
 	$(call gb_Helper_make_url,$(call gb_UnoApi_get_target,$(item))))" \
--env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_URE_LIB_FOLDER)) \
--env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_LIB_FOLDER))
+-env:URE_INTERNAL_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD)) \
+-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD))
 endef
 
 define gb_Gallery__command