From 3bbf6eb401cd8ae9e495a126d438eb1a4e4bd829 Mon Sep 17 00:00:00 2001
From: Michael Ow <mow@svn.icu-project.org>
Date: Tue, 2 Mar 2010 09:46:00 +0000
Subject: [PATCH] ICU-7138 Fix Windows makedata error.

X-SVN-Rev: 27736
---
 icu4c/source/data/makedata.mak          | 18 +++++++++++++++++-
 icu4c/source/data/mappings/ucmebcdic.mk |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index 4ef4f9c80b..41ab5e104d 100644
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -205,7 +205,12 @@ UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_FILES)
 !IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmebcdic.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmebcdic.mk"
 UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_EBCDIC)
-UCM_SOURCE_SPECIAL=$(UCM_SOURCE_SPECIAL) $(UCM_SOURCE_EBCDIC_IGNORE_SISO)
+!IFDEF UCM_SOURCE_EBCDIC_IGNORE_SISO
+BUILD_SPECIAL_CNV_FILES=YES
+UCM_SOURCE_SPECIAL=$(UCM_SOURCE_EBCDIC_IGNORE_SISO)
+!ELSE
+!UNDEF BUILD_SPECIAL_CNV_FILES
+!ENDIF
 !ELSE
 !MESSAGE Warning: cannot find "ucmebcdic.mk". Not building EBCDIC converter files.
 !ENDIF
@@ -213,13 +218,18 @@ UCM_SOURCE_SPECIAL=$(UCM_SOURCE_SPECIAL) $(UCM_SOURCE_EBCDIC_IGNORE_SISO)
 !IF EXISTS("$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUUCM)\ucmlocal.mk"
 UCM_SOURCE=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL)
+!IFDEF UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL
 UCM_SOURCE_SPECIAL=$(UCM_SOURCE_SPECIAL) $(UCM_SOURCE_EBCDIC_IGNORE_SISO_LOCAL)
+BUILD_SPECIAL_CNV_FILES=YES
+!ENDIF
 !ELSE
 !MESSAGE Information: cannot find "ucmlocal.mk". Not building user-additional converter files.
 !ENDIF
 
 CNV_FILES=$(UCM_SOURCE:.ucm=.cnv)
+!IFDEF BUILD_SPECIAL_CNV_FILES
 CNV_FILES_SPECIAL=$(UCM_SOURCE_SPECIAL:.ucm=.cnv)
+!ENDIF
 
 !IF EXISTS("$(ICUSRCDATA)\$(ICUBRK)\brkfiles.mk")
 !INCLUDE "$(ICUSRCDATA)\$(ICUBRK)\brkfiles.mk"
@@ -719,9 +729,11 @@ $(CNV_FILES): $(UCM_SOURCE)
 	@echo Making Charset Conversion tables
 	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" -c -d"$(ICUBLD_PKG)" $(ICUSRCDATA_RELATIVE_PATH)\$(ICUUCM)\$(@B).ucm
 
+!IFDEF BUILD_SPECIAL_CNV_FILES
 $(CNV_FILES_SPECIAL): $(UCM_SOURCE_SPECIAL)
 	@echo Making Special Charset Conversion tables
 	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" -c --ignore-siso-check -d"$(ICUBLD_PKG)" $(ICUSRCDATA_RELATIVE_PATH)\$(ICUUCM)\$(@B).ucm
+!ENDIF
 
 # Batch inference rule for creating miscellaneous resource files
 # TODO: -q option is specified to squelch the 120+ warnings about
@@ -974,6 +986,10 @@ res_index:table(nofallback) {
 !IFNDEF ICUDATA_SOURCE_ARCHIVE
 $(UCM_SOURCE) : {"$(ICUTOOLS)\makeconv\$(CFG)"}makeconv.exe
 
+!IFDEF BUILD_SPECIAL_CNV_FILES
+$(UCM_SOURCE_SPECIAL): {"$(ICUTOOLS)\makeconv\$(CFG)"}makeconv.exe
+!ENDIF
+
 # This used to depend on "$(ICUBLD_PKG)\uprops.icu" "$(ICUBLD_PKG)\ucase.icu" "$(ICUBLD_PKG)\ubidi.icu"
 # This data is now hard coded as a part of the library.
 # See Jitterbug 4497 for details.
diff --git a/icu4c/source/data/mappings/ucmebcdic.mk b/icu4c/source/data/mappings/ucmebcdic.mk
index be1755ecf6..2b89696c01 100644
--- a/icu4c/source/data/mappings/ucmebcdic.mk
+++ b/icu4c/source/data/mappings/ucmebcdic.mk
@@ -26,4 +26,4 @@ ibm-4517_P100-2005.ucm ibm-4899_P100-1998.ucm ibm-4971_P100-1999.ucm\
 ibm-500_P100-1995.ucm ibm-5123_P100-1999.ucm ibm-803_P100-1999.ucm\
 ibm-8482_P100-1999.ucm ibm-9067_X100-2005.ucm ibm-16684_P110-2003.ucm
 
-UCM_SOURCE_EBCDIC_IGNORE_SISO =
\ No newline at end of file
+#UCM_SOURCE_EBCDIC_IGNORE_SISO =
\ No newline at end of file