diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:23:12 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:23:12 +0000 |
| commit | 6ec3e842161bb7c1c225df06d63570fb4c163a52 (patch) | |
| tree | fbb8c61da30d7df9d546c8efbe8d7aa453ff3074 /automation | |
| parent | eb8393da7a3ce1ffcae8c7212286d42a38f5381d (diff) | |
INTEGRATION: CWS sb88 (1.12.16); FILE MERGED
2008/06/16 09:05:04 sb 1.12.16.2: fixed quoting issue (broke Ubuntu tinderbox build)
2008/06/05 09:17:54 sb 1.12.16.1: #i88680# add [Bootstrap] section to testtool.ini so that testtool can be started from basis layer of three layer office
Diffstat (limited to 'automation')
| -rw-r--r-- | automation/source/testtool/makefile.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk index a1c8b6b6f987..4cb27a48ddd4 100644 --- a/automation/source/testtool/makefile.mk +++ b/automation/source/testtool/makefile.mk @@ -8,7 +8,7 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12 $ +# $Revision: 1.13 $ # # This file is part of OpenOffice.org. # @@ -102,14 +102,14 @@ $(MISC)$/xfilter.pl : filter.pl .IF "$(GUI)"=="UNX" -INIFILE=$(BIN)$/testtoolrc +INIFILESUFFIX=rc .ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2" -INIFILE=$(BIN)$/testtool.ini +INIFILESUFFIX=.ini .END -$(INIFILE): testtool.ini - -$(COPY) $< $@ +$(BIN)$/testtool$(INIFILESUFFIX): testtool.ini + $(SED) -e s/$(EMQ)!INIFILESUFFIX$(EMQ)!/$(INIFILESUFFIX)/ < $< > $@ ALLTAR: \ - $(INIFILE) + $(BIN)$/testtool$(INIFILESUFFIX) |