diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 14:58:56 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 14:58:56 +0000 |
| commit | 5a3fa4ff3a667b89b149ba3435f8831d72d9447c (patch) | |
| tree | 98a11725b5a9c9b80910f1ae0f01efeeb2f5be82 /tools/util | |
| parent | eb6dd08b3fb6e68e682a2ffccab13e1713e53c0e (diff) | |
INTEGRATION: CWS supdremove02 (1.23.12); FILE MERGED
2008/01/28 12:17:05 rt 1.23.12.1: #i85482# Remove UPD from library name
Diffstat (limited to 'tools/util')
| -rw-r--r-- | tools/util/makefile.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/util/makefile.mk b/tools/util/makefile.mk index 9f0f947ef5cc..cc4d2328f72b 100644 --- a/tools/util/makefile.mk +++ b/tools/util/makefile.mk @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.23 $ +# $Revision: 1.24 $ # -# last change: $Author: obo $ $Date: 2008-01-07 09:48:44 $ +# last change: $Author: obo $ $Date: 2008-02-25 15:58:56 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -37,7 +37,6 @@ PRJ=.. PRJNAME=TOOLS TARGET=tools -VERSION=$(UPD) ENABLE_EXCEPTIONS=true # --- Settings ----------------------------------------------------- @@ -101,7 +100,7 @@ LIB1FILES+= $(SLB)$/dll.lib .IF "$(BIG_TOOLS)"!="" .IF "$(GUI)"=="WNT" -#SOLARLIBDIR=$(SOLARVER)\$(UPD)\$(INPATH)\lib +#SOLARLIBDIR=$(SOLARVER)\$((INPATH)\lib #SOLARLIBDIR=..\$(INPATH)\lib # bei lokalen osl rtl oder vos das SOLARLIBDIR bitte patchen ! LIB1FILES+= $(SOLARLIBDIR)\xosl.lib \ @@ -113,7 +112,7 @@ SHL1STDLIBS+= $(WSOCK32LIB) # --- TOOLS.DLL --- -SHL1TARGET= tl$(VERSION)$(DLLPOSTFIX) +SHL1TARGET= tl$(DLLPOSTFIX) SHL1LIBS= $(LIB1TARGET) SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1IMPLIB= itools |