diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-05-10 14:39:47 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-11 11:27:18 +0100 |
| commit | 583551810609804b225ab33456f0a2ae04ad16c1 (patch) | |
| tree | a4f84c37fa8f503ef1bb95d9865e74cd3f7d90d5 /scp2 | |
| parent | b1c3f00d9b0ef6c91b0209c13531bd1f9d63c1e0 (diff) | |
upgrade to icu 49
Change-Id: I I I I I If403ee07ef8ea654369a8faac57fa8940f90e040
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 16 | ||||
| -rw-r--r-- | scp2/source/ooo/shortcut_ooo.scp | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 83f125eddc8a..e3ae2390fc30 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -704,9 +704,9 @@ End File gid_File_Lib_Icudata LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT7(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT8(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); #else - Name = STRING(CONCAT4(icudt,ICU_MAJOR,ICU_MINOR,.dll)); + Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); @@ -715,9 +715,9 @@ End File gid_File_Lib_Icui18n LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT7(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT8(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); #else - Name = STRING(CONCAT4(icuin,ICU_MAJOR,ICU_MINOR,.dll)); + Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); @@ -726,9 +726,9 @@ End File gid_File_Lib_Icule LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT7(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT8(libicule,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); #else - Name = STRING(CONCAT4(icule,ICU_MAJOR,ICU_MINOR,.dll)); + Name = STRING(CONCAT3(icule,ICU_MAJOR,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); @@ -737,9 +737,9 @@ End File gid_File_Lib_Icuuc LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT7(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT8(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); #else - Name = STRING(CONCAT4(icuuc,ICU_MAJOR,ICU_MINOR,.dll)); + Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll)); #endif Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index a70c225d1db5..0df44d301f75 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -34,7 +34,7 @@ Shortcut gid_Shortcut_Lib_Icudata FileID = gid_File_Lib_Icudata; Dir = SCP2_OOO_BIN_DIR; #ifndef AIX - Name = STRING(CONCAT5(libicudata,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); + Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR)); #else Name = "libicudata.so"; #endif @@ -45,7 +45,7 @@ Shortcut gid_Shortcut_Lib_Icui18n FileID = gid_File_Lib_Icui18n; Dir = SCP2_OOO_BIN_DIR; #ifndef AIX - Name = STRING(CONCAT5(libicui18n,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); + Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR)); #else Name = "libicui18n.so"; #endif @@ -56,7 +56,7 @@ Shortcut gid_Shortcut_Lib_Icule FileID = gid_File_Lib_Icule; Dir = SCP2_OOO_BIN_DIR; #ifndef AIX - Name = STRING(CONCAT5(libicule,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); + Name = STRING(CONCAT4(libicule,UNXSUFFIX,.,ICU_MAJOR)); #else Name = "libicule.so"; #endif @@ -67,7 +67,7 @@ Shortcut gid_Shortcut_Lib_Icuuc FileID = gid_File_Lib_Icuuc; Dir = SCP2_OOO_BIN_DIR; #ifndef AIX - Name = STRING(CONCAT5(libicuuc,UNXSUFFIX,.,ICU_MAJOR,ICU_MINOR)); + Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR)); #else Name = "libicuuc.so"; #endif |