Index: source/data/makedata.mak |
diff --git a/source/data/makedata.mak b/source/data/makedata.mak |
index 1f454c84e46d28aceca915a5c1be304dd6a1e188..44adaff5fd326b029def22ae88f9e2c4d8773086 100644 |
--- a/source/data/makedata.mak |
+++ b/source/data/makedata.mak |
@@ -502,7 +502,7 @@ COMMON_ICUDATA_ARGUMENTS=-f -e $(U_ICUDATA_NAME) -v $(ICU_PACKAGE_MODE) -c -p $( |
# Building the common dll in $(ICUBLD_PKG) unconditionally copies it to $(DLL_OUTPUT) too. |
# |
############################################################################# |
-ALL : GODATA "$(ICU_LIB_TARGET)" "$(TESTDATAOUT)\testdata.dat" |
+ALL : GODATA "$(ICU_LIB_TARGET)" |
@echo All targets are up to date |
# The core Unicode properties files (uprops.icu, ucase.icu, ubidi.icu) |
@@ -621,6 +621,7 @@ icu4j-data-install : |
cd "$(ICUBLD_PKG)" |
"$(ICUPBIN)\icupkg" -x * --list "$(ICUDATA_SOURCE_ARCHIVE)" > "$(ICUTMP)\icudata.lst" |
"$(ICUPBIN)\pkgdata" $(COMMON_ICUDATA_ARGUMENTS) "$(ICUTMP)\icudata.lst" |
+ editbin /NXCOMPAT /DYNAMICBASE "$(U_ICUDATA_NAME).dll" |
copy "$(U_ICUDATA_NAME).dll" "$(DLL_OUTPUT)" |
-@erase "$(U_ICUDATA_NAME).dll" |
copy "$(ICUTMP)\$(ICUPKG).dat" "$(ICUOUT)\$(U_ICUDATA_NAME)$(U_ICUDATA_ENDIAN_SUFFIX).dat" |