diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-12-03 13:21:54 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-12-03 13:21:54 +0000 |
| commit | 3ac1f36241838514a5f8567b98fbef2d916cc767 (patch) | |
| tree | 04e36167c545decf1403855741ab208df732b1da /postprocess/rebase | |
| parent | INTEGRATION: CWS vq06 (1.1.2); FILE MERGED (diff) | |
| download | core-3ac1f36241838514a5f8567b98fbef2d916cc767.tar.gz core-3ac1f36241838514a5f8567b98fbef2d916cc767.zip | |
INTEGRATION: CWS vq06 (1.2.2); FILE MERGED
2004/12/03 01:39:46 vq 1.2.2.2: #i38176# Fix OOo - windows rebase problem.
2004/12/02 04:07:14 vq 1.2.2.1: #i38176# Fix W32-tcsh problem.
Diffstat (limited to 'postprocess/rebase')
| -rwxr-xr-x | postprocess/rebase/makefile.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/postprocess/rebase/makefile.mk b/postprocess/rebase/makefile.mk index 4802d1cb6ade..a594f46d5cb1 100755 --- a/postprocess/rebase/makefile.mk +++ b/postprocess/rebase/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: rt $ $Date: 2004-11-29 10:09:20 $ +# last change: $Author: rt $ $Date: 2004-12-03 14:21:54 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -72,7 +72,7 @@ $(TARGET) .PHONY : .IF "$(GUI)"=="WNT" .IF "$(product)"=="full" @+echo ------ rebase dlls ------ - +rebase -b 0x68000000 -C $(MISC)$/coffbase.txt -d -l $(MISC)$/rebase_log.txt -R $(SOLARBINDIR) -N no_rebase.txt $(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll + +$(WRAPCMD) rebase -v -b 0x68000000 -C $(MISC)$/coffbase.txt -d -l $(MISC)$/rebase_log.txt -R $(SOLARBINDIR) -N no_rebase.txt $(SOLARBINDIR)$/*.dll $(SOLARBINDIR)$/so$/*.dll .ENDIF .ELSE @+echo Nothing to do, 'rebase' is windows only. @@ -80,6 +80,6 @@ $(TARGET) .PHONY : .ERROR: @+echo ERROR COMMENT: If after rebase dmake dies with error code 227, - @+echo ERROR COMMENT: it may be we've got another dll which must not + @+echo ERROR COMMENT: it may be we have got another dll which must not @+echo ERROR COMMENT: get rebased. Contact JL whether something needs @+echo ERROR COMMENT: to be added to no_rebase.txt |