summaryrefslogtreecommitdiff
path: root/icu/makefile.mk
diff options
context:
space:
mode:
Diffstat (limited to 'icu/makefile.mk')
-rw-r--r--icu/makefile.mk16
1 files changed, 10 insertions, 6 deletions
diff --git a/icu/makefile.mk b/icu/makefile.mk
index 4748d593bcf6..45a6d8a94cec 100644
--- a/icu/makefile.mk
+++ b/icu/makefile.mk
@@ -2,9 +2,9 @@
#
# $RCSfile: makefile.mk,v $
#
-# $Revision: 1.8 $
+# $Revision: 1.9 $
#
-# last change: $Author: er $ $Date: 2002-10-31 15:45:58 $
+# last change: $Author: hr $ $Date: 2003-03-26 11:28:37 $
#
# The Contents of this file are made available subject to the terms of
# either of the following licenses
@@ -133,7 +133,11 @@ CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.bat
CONFIGURE_ACTION=$(BACK_PATH)..$/..$/convert.sh
.ENDIF # "$(USE_SHELL)"=="4nt"
BUILD_DIR=source
+.IF "$(COMEX)"=="8"
+BUILD_ACTION=wdevenv allinone$/allinone Release
+.ELSE
BUILD_ACTION=msdev allinone$/allinone.dsw /useenv /MAKE "all - Win32 Release"
+.ENDIF
OUT2LIB= \
$(BUILD_DIR)$/..$/lib$/icudata.lib \
@@ -153,7 +157,7 @@ OUT2BIN= \
all: \
$(MISC)$/remove_build.flag \
ALLTAR
-
+
.INCLUDE : set_ext.mk
.INCLUDE : target.mk
.INCLUDE : tg_ext.mk
@@ -164,9 +168,9 @@ TG_DELIVER : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
.IF "$(BINARY_PATCH_FILE_NAME)"!=""
$(PACKAGE_DIR)$/so_add_binary : $(PACKAGE_DIR)$/$(ADD_FILES_FLAG_FILE)
- cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILE_NAME) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
+ cd $(PACKAGE_DIR) && gunzip -c $(BACK_PATH)$(BINARY_PATCH_FILE_NAME) | tar $(TAR_EXCLUDE_SWITCH) -xvf -
+$(TOUCH) $(PACKAGE_DIR)$/so_add_binary
-
+
$(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
.ENDIF
@@ -174,7 +178,7 @@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_add_binary
# Since you never know what will be in a patch (for example, it may already
# patch at configure level) or in the case of a binary patch, we remove the
# entire package directory if a patch is newer.
-# Changes in this makefile could also make a complete build necessary if
+# Changes in this makefile could also make a complete build necessary if
# configure is affected.
$(MISC)$/remove_build.flag : $(BINARY_PATCH_FILE_NAME) $(PATCH_FILE_NAME) makefile.mk
$(REMOVE_PACKAGE_COMMAND)