diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 09:23:37 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2003-04-17 09:23:37 +0000 |
| commit | be87d44c7f5de4d3a9257d7872d4309538f9497e (patch) | |
| tree | b0906a6070d453cb89d4338db15551bc42baf1a3 /offapi/util | |
| parent | 66b23bacd42c174549232a203c70d3714b839783 (diff) | |
INTEGRATION: CWS sdk01 (1.34.2.10.2.3.2.1.54); FILE MERGED
2003/03/28 14:41:01 jsc 1.34.2.10.2.3.2.1.54.1: #107389# no check for some type, only temporary
Diffstat (limited to 'offapi/util')
| -rw-r--r-- | offapi/util/makefile.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/offapi/util/makefile.mk b/offapi/util/makefile.mk index bbb5e2c7ca0c..af957d7b6c87 100644 --- a/offapi/util/makefile.mk +++ b/offapi/util/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.52 $ +# $Revision: 1.53 $ # -# last change: $Author: hr $ $Date: 2003-03-26 13:59:19 $ +# last change: $Author: rt $ $Date: 2003-04-17 10:23:37 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -171,8 +171,10 @@ ALLTAR: $(REGISTRYCHECKFLAG) # special work necessary for i18n reservedWords # ATTENTION: no special handling for other types is allowed. +# JSC -> temporary special handling for sheet/SheetSortDescriptor and text/BaseIndex +# only for build reasons, otherwise the build will break, the changes are not really incompatible $(REGISTRYCHECKFLAG) : $(UCR)$/types.db $(OUT)$/ucrdoc$/types_doc.db - +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_RDB) -r2 $(UCR)$/types.db -x /UCR/com/sun/star/i18n/reservedWords - +$(REGCOMPARE) -t -r1 $(REFERENCE_SO_60_DOC_RDB) -r2 $(OUT)$/ucrdoc$/types_doc.db -x /UCR/com/sun/star/i18n/reservedWords && echo > $(REGISTRYCHECKFLAG) + +$(REGCOMPARE) -f -t -r1 $(REFERENCE_SO_60_RDB) -r2 $(UCR)$/types.db -x /UCR/com/sun/star/i18n/reservedWords + +$(REGCOMPARE) -f -t -r1 $(REFERENCE_SO_60_DOC_RDB) -r2 $(OUT)$/ucrdoc$/types_doc.db -x /UCR/com/sun/star/i18n/reservedWords -x /UCR/com/sun/star/sheet/SheetSortDescriptor -x /UCR/com/sun/star/text/BaseIndex && echo > $(REGISTRYCHECKFLAG) .ENDIF |