diff --git a/icu4c/source/common/udata.c b/icu4c/source/common/udata.c index a7524d7235..db8ce82942 100644 --- a/icu4c/source/common/udata.c +++ b/icu4c/source/common/udata.c @@ -804,11 +804,14 @@ openCommonData(UDataMemory *pData, *basename=0; /* try to find the Table of Contents */ +#if 0 if(uprv_strcmp(inBasename, U_ICUDATA_NAME) == 0) { uprv_strcpy(entryName, "icudata"); } else { uprv_strcpy(entryName, inBasename); } +#endif + uprv_strcpy(entryName, inBasename); uprv_strcat(entryName, "_" DATA_TYPE); pHeader=normalizeDataPointer((const DataHeader *)GET_LIBRARY_ENTRY(lib, entryName)); diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in index 3cad425f50..cdce4e5857 100644 --- a/icu4c/source/data/Makefile.in +++ b/icu4c/source/data/Makefile.in @@ -104,7 +104,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status packagedata: build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc - ( cd build ; $(INVOKE) $(PKGDATA) -e icudata -s . -T . -p $(ICUDATA_NAME) icudata.lst ) + ( cd build ; $(INVOKE) $(PKGDATA) -e $(ICUDATA_NAME) -s . -T . -p $(ICUDATA_NAME) icudata.lst ) packagetest: $(TESTDATAOBJDIR)/testdata.lst $(top_builddir)/tools/pkgdata/icupkg.inc ( cd $(TESTDATAOBJDIR) ; $(INVOKE) $(PKGDATA) -T . -s . -p testdata testdata.lst ) diff --git a/icu4c/source/data/build/makedata.mak b/icu4c/source/data/build/makedata.mak index 5285d62b43..acdba586cb 100644 --- a/icu4c/source/data/build/makedata.mak +++ b/icu4c/source/data/build/makedata.mak @@ -8,7 +8,7 @@ # # 12/10/1999 weiv Created -U_ICUDATA_NAME=icudt18l +U_ICUDATA_NAME=icudt19l #If no config, we default to debug !IF "$(CFG)" == "" @@ -140,7 +140,7 @@ BRK_FILES = "$(ICUDBLD)\sent.brk" "$(ICUDBLD)\char.brk" "$(ICUDBLD)\line.brk" "$ "$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" : $(CNV_FILES) $(BRK_FILES) qchk.dat fchk.dat uprops.dat unames.dat unorm.dat cnvalias.dat tz.dat ucadata.dat invuca.dat $(ALL_RES) icudata.res @echo Building icu data @cd "$(ICUDBLD)" - "$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -e icudata -v -T . -m dll -c -p $(U_ICUDATA_NAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s . <