summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--automation/source/testtool/makefile.mk5
-rw-r--r--automation/source/testtool/testtool.ini2
2 files changed, 5 insertions, 2 deletions
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index 4cb27a48ddd4..79a811fdaee7 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -103,12 +103,15 @@ $(MISC)$/xfilter.pl : filter.pl
.IF "$(GUI)"=="UNX"
INIFILESUFFIX=rc
+BRANDPATH=none
.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
INIFILESUFFIX=.ini
+BRANDPATH=..
.END
$(BIN)$/testtool$(INIFILESUFFIX): testtool.ini
- $(SED) -e s/$(EMQ)!INIFILESUFFIX$(EMQ)!/$(INIFILESUFFIX)/ < $< > $@
+ $(SED) -e s/$(EMQ)!INIFILESUFFIX$(EMQ)!/$(INIFILESUFFIX)/ \
+ -e s/$(EMQ)!BRANDPATH$(EMQ)!/$(BRANDPATH)/ < $< > $@
ALLTAR: \
$(BIN)$/testtool$(INIFILESUFFIX)
diff --git a/automation/source/testtool/testtool.ini b/automation/source/testtool/testtool.ini
index bf1b54c8777e..ff2e43f5c0f6 100644
--- a/automation/source/testtool/testtool.ini
+++ b/automation/source/testtool/testtool.ini
@@ -1,7 +1,7 @@
[Bootstrap]
URE_BOOTSTRAP=${ORIGIN}/fundamentalbasis!INIFILESUFFIX!
OOO_BASE_DIR=${ORIGIN}/..
-BRAND_BASE_DIR=${OOO_BASE_DIR}/none
+BRAND_BASE_DIR=${OOO_BASE_DIR}/!BRANDPATH!
UserInstallation=${SYSUSERCONFIG}/.oootesttool
[Misc]