summaryrefslogtreecommitdiff
path: root/solenv/gbuild/TargetLocations.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-16 11:08:32 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-18 21:11:16 +0300
commitc6a73009747814513ab5a7277c211449c7378870 (patch)
tree2adc961b3c83deffcea251c41744f2626e476f38 /solenv/gbuild/TargetLocations.mk
parent18041138d3169d565755565bdbabd8de596b5ac7 (diff)
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to use those from <config_folders.h> instead. In normal builds, the end result will not change. Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
-rw-r--r--solenv/gbuild/TargetLocations.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 9f8ce63780b7..ed9246355f57 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -39,7 +39,7 @@ gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb
gb_Rdb_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/xml/$(1).rdb
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
gb_ResTarget_get_unittest_target = \
- $(OUTDIR)/unittest/install/program/resource/$(1).res
+ $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb
gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
gb_Configuration_registry = $(OUTDIR)/xml/registry
@@ -88,7 +88,7 @@ gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$
gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared
gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test
gb_CppunitTestFakeExecutable_get_target = \
- $(OUTDIR)/unittest/install/program/$(1)
+ $(OUTDIR)/unittest/install/$(LIBO_BIN_FOLDER)/$(1)
gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist
gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done
gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done