diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-14 10:32:24 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-14 10:32:24 +0000 |
| commit | 50680c8efb3310d8aa05bc1eb8e8f137f4013db8 (patch) | |
| tree | 906c413f27ae99edd72b5a0d04d718b30e9d46f7 /icu | |
| parent | 734ef8eb4adf8b46b9c98289f8b81693d1f384db (diff) | |
INTEGRATION: CWS ause015 (1.20.6); FILE MERGED
2005/01/04 13:51:20 hjs 1.20.6.1: #i39137# fix windows versions; use COPY macro
Diffstat (limited to 'icu')
| -rw-r--r-- | icu/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk index 8fce9868534c..4e01e09103bb 100644 --- a/icu/makefile.mk +++ b/icu/makefile.mk @@ -2,9 +2,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.20 $ +# $Revision: 1.21 $ # -# last change: $Author: rt $ $Date: 2004-11-09 15:08:55 $ +# last change: $Author: kz $ $Date: 2005-01-14 11:32:24 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -136,7 +136,9 @@ CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat .ENDIF .ELSE # "$(USE_SHELL)"=="4nt" BUILD_ACTION_SEP=; +.IF "$(COMEX)"=="8" CONFIGURE_ACTION=sh $(BACK_PATH)..$/..$/convert.sh +.ENDIF .ENDIF # "$(USE_SHELL)"=="4nt" BUILD_DIR=source .IF "full_debug" == "" @@ -168,7 +170,7 @@ ICU_BUILD_LIBPOST= CONFIGURE_ACTION+= $(BUILD_ACTION_SEP) wdevenv allinone$/allinone $(ICU_BUILD_VERSION) BUILD_ACTION=devenv allinone$/allinone.sln /build $(ICU_BUILD_VERSION) /project all /useenv .ELIF "$(COMEX)"=="10" -CONFIGURE_ACTION+= $(BUILD_ACTION_SEP) cp ..$/..$/..$/..$/..$/makefiles.zip . $(BUILD_ACTION_SEP) unzip makefiles.zip +CONFIGURE_ACTION+= $(COPY) ..$/..$/..$/..$/..$/makefiles.zip . $(BUILD_ACTION_SEP) unzip makefiles.zip BUILD_ACTION=cd allinone$/all && cmd /c nmake /f all.mak CFG="all - Win32 Release" && cd ..$/.. .ELSE BUILD_ACTION=msdev allinone$/allinone.dsw /useenv /MAKE "all - Win32 $(ICU_BUILD_VERSION)" |