diff options
| -rw-r--r-- | crashrep/CustomTarget_crashrep_res.mk | 1 | ||||
| -rw-r--r-- | shell/CustomTarget_shlxthdl_res.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/Gallery.mk | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/crashrep/CustomTarget_crashrep_res.mk b/crashrep/CustomTarget_crashrep_res.mk index 46d10163a251..613043264be8 100644 --- a/crashrep/CustomTarget_crashrep_res.mk +++ b/crashrep/CustomTarget_crashrep_res.mk @@ -21,7 +21,6 @@ $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : \ $(SRCDIR)/crashrep/source/win32/rctemplate.txt \ $(call gb_Executable_get_runtime_dependencies,lngconvex) -#BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1) $(call gb_Helper_abbreviate_dirs,\ diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk index 025dc918d617..abcdfa0a8f82 100644 --- a/shell/CustomTarget_shlxthdl_res.mk +++ b/shell/CustomTarget_shlxthdl_res.mk @@ -23,7 +23,7 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),LCX,1) $(call gb_Helper_abbreviate_dirs,\ cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \ - BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \ + BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT)) \ $(call gb_Executable_get_command,lngconvex) \ -ulf $< \ -rc $@ \ 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),\ |