mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-08 06:53:45 +00:00
ICU-758 keep the entrypoint as icudata_dat on unix
X-SVN-Rev: 3153
This commit is contained in:
parent
be992980b1
commit
754e9cbf9b
3 changed files with 5 additions and 3 deletions
|
@ -102,7 +102,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) -s . -T . -p $(ICUDATA_NAME) icudata.lst )
|
||||
( cd build ; $(INVOKE) $(PKGDATA) -e icudata -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 )
|
||||
|
@ -116,7 +116,7 @@ cleanpackage:
|
|||
## Install ICU data. Make a convenience link 'icudata' library if it's a library mode.
|
||||
install: build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc
|
||||
$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(ICUDATA_DIR)/$(VERSION)
|
||||
( cd build ; $(INVOKE) $(PKGDATA) -T . -s . -p $(ICUDATA_NAME) icudata.lst -I $(DESTDIR)$(ICUDATA_DIR)/$(VERSION) )
|
||||
( cd build ; $(INVOKE) $(PKGDATA) -e icudata -T . -s . -p $(ICUDATA_NAME) icudata.lst -I $(DESTDIR)$(ICUDATA_DIR)/$(VERSION) )
|
||||
ifeq ($(strip $(PKGDATA_MODE)),dll)
|
||||
(cd $(DESTDIR)$(ICUDATA_DIR)/$(VERSION); $(RM) icudata.$(SO) && ln -s $(ICUDATA_NAME).$(SO) icudata.$(SO))
|
||||
endif
|
||||
|
|
|
@ -154,7 +154,7 @@ void pkg_mode_dll(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
|
|||
T_FileStream_writeLine(makefile, "# 'TOCOBJ' contains C Table of Contents objects [if any]\n");
|
||||
|
||||
sprintf(tmp, "$(TEMP_DIR)/%s_dat.c: $(CMNLIST)\n"
|
||||
"\t$(INVOKE) $(GENCMN) -n %s -S -d $(TEMP_DIR) 0 $(CMNLIST)\n\n", o->shortName, o->shortName);
|
||||
"\t$(INVOKE) $(GENCMN) -e %s -n %s -S -d $(TEMP_DIR) 0 $(CMNLIST)\n\n", o->shortName, o->entryName, o->shortName);
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
sprintf(tmp, "TOCOBJ= %s_dat%s \n\n", o->shortName,OBJ_SUFFIX);
|
||||
T_FileStream_writeLine(makefile, tmp);
|
||||
|
|
|
@ -36,6 +36,7 @@ pkg_mak_writeHeader(FileStream *f, const UPKGOptions *o)
|
|||
"TEMP_DIR=%s\n"
|
||||
"MODE=%s\n"
|
||||
"MAKEFILE=%s\n"
|
||||
"ENTRYPOINT=%s\n"
|
||||
"include %s\n"
|
||||
"\n\n\n",
|
||||
o->shortName,
|
||||
|
@ -43,6 +44,7 @@ pkg_mak_writeHeader(FileStream *f, const UPKGOptions *o)
|
|||
o->tmpDir,
|
||||
o->mode,
|
||||
o->makeFile,
|
||||
o->entryName,
|
||||
o->options);
|
||||
T_FileStream_writeLine(f, linebuf);
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue