diff options
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index d4cd99eb81ed..ca87c36f6bab 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -168,7 +168,6 @@ endif $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ -DICU_MAJOR=$(ICU_MAJOR) \ -DICU_MINOR=$(ICU_MINOR) \ - -DICU_MICRO=$(ICU_MICRO) \ )) ifneq ($(SYSTEM_LIBXSLT),YES) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 292a05f4c52e..3be07e415feb 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -644,7 +644,7 @@ End File gid_File_Lib_Icudata LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll)); #endif @@ -655,7 +655,7 @@ End File gid_File_Lib_Icui18n LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll)); #endif @@ -666,7 +666,7 @@ End File gid_File_Lib_Icule LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicule,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicule,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icule,ICU_MAJOR,.dll)); #endif @@ -677,7 +677,7 @@ End File gid_File_Lib_Icuuc LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT8(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR,.,ICU_MICRO)); + Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll)); #endif |