ICU-3258 CygWin/MSVC changes. Fix the -r option

X-SVN-Rev: 13220
This commit is contained in:
George Rhoten 2003-09-26 04:46:24 +00:00
parent 1f1b79016d
commit 6586182a66
2 changed files with 11 additions and 2 deletions

View file

@ -40,21 +40,24 @@ pkg_mak_writeHeader(FileStream *f, const UPKGOptions *o)
U_ICU_VERSION);
T_FileStream_writeLine(f, linebuf);
sprintf(linebuf, "NAME=%s\n"
sprintf(linebuf, "NAME=%s%s\n"
"CNAME=%s\n"
"TARGETDIR=%s\n"
"TEMP_DIR=%s\n"
"MODE=%s\n"
"MAKEFILE=%s\n"
"ENTRYPOINT=%s\n"
"TARGET_VERSION=%s\n"
"\n\n\n",
o->shortName,
(o->version ? o->version : ""),
o->cShortName,
o->targetDir,
o->tmpDir,
o->mode,
o->makeFile,
o->entryName);
o->entryName,
(o->version ? o->version : ""));
T_FileStream_writeLine(f, linebuf);
sprintf(linebuf, "## List files [%d] containing data files to process (note: - means stdin)\n"

View file

@ -93,6 +93,9 @@ void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
if(isDll) {
uprv_strcpy(tmp, LIB_PREFIX);
uprv_strcat(tmp, o->cShortName);
if (o->version) {
uprv_strcat(tmp, "$(TARGET_VERSION)");
}
uprv_strcat(tmp, UDATA_SO_SUFFIX);
if(o->nooutput || o->verbose) {
@ -199,6 +202,9 @@ void pkg_mode_windows(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
}
uprv_strcpy(tmp, UDATA_CMN_PREFIX);
uprv_strcat(tmp, o->cShortName);
if (o->version) {
uprv_strcat(tmp, "$(TARGET_VERSION)");
}
uprv_strcat(tmp, UDATA_CMN_SUFFIX);
if(o->nooutput || o->verbose) {