diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-10-28 23:16:52 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-10-29 00:58:42 +0100 |
| commit | 32a4efb8c5c002e96cbf4b2a1cc4e7d9817dde31 (patch) | |
| tree | ba519ab3fb0b09b126340da71fdebcc97ba94043 /solenv | |
| parent | 2830bf9af9a640e1c484b959ee2dcbe1aeabb0f6 (diff) | |
gbuild: stop using stuff in OUTDIR/unittest/install
Change-Id: Icdfe1282d5e636a034ee7d1b16b9a113a9b70492
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 963b77a489f4..e108fbc137c4 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -50,7 +50,7 @@ gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppun define gb_CppunitTest__make_args $(HEADLESS) \ -"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install)" \ +"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT))" \ "-env:BRAND_SHARE_SUBDIR=share" \ $(if $(URE),\ $(if $(strip $(CONFIGURATION_LAYERS)),\ diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk index bc60a3b3e75a..b61bb02297e9 100644 --- a/solenv/gbuild/Gallery.mk +++ b/solenv/gbuild/Gallery.mk @@ -16,7 +16,7 @@ gb_Gallery_INSTDIR := $(LIBO_SHARE_FOLDER)/gallery # BRAND_BASE_DIR is for resource files define gb_Gallery__make_env_args -"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/unittest/install)" \ +"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT_FOR_BUILD))" \ "-env:CONFIGURATION_LAYERS=xcsxcu:$(call gb_Helper_make_url,$(INSTROOT)/$(LIBO_SHARE_FOLDER)/registry)" \ "-env:UNO_SERVICES=$(call gb_Helper_make_url,$(call gb_Rdb_get_target_for_build,ure/services)) \ $(foreach item,$(gb_Gallery__UNO_COMPONENTS),\ |