diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-09-02 23:08:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-09-02 23:08:51 +0200 |
| commit | e486f1612d814cf4255e9fc27e722c123d953809 (patch) | |
| tree | 9ad3d38d576631f2d6a96dcd1d30c5faa2ee70b4 /scp2 | |
| parent | fd636fe7222bf4193245be2e7bdf179b534171df (diff) | |
No need to install non-SONAME versions of icu libs
Change-Id: Ica8057c70f5e4b63830c6ffe7fb85269a10b845f
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/shortcut_ooo.scp | 40 |
3 files changed, 3 insertions, 44 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index b21e7a2bb9ff..51a5066cc66b 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -114,7 +114,6 @@ endif $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\ -DICU_MAJOR=$(ICU_MAJOR) \ - -DICU_MINOR=$(ICU_MINOR) \ )) ifneq ($(SYSTEM_LIBXSLT),YES) diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 417846ca8e9f..b5ff16688086 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -196,7 +196,7 @@ End File gid_File_Lib_Icudata PACKED_LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); + Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR)); #else #ifdef MSVC_PKG_DEBUG_RUNTIME Name = STRING(CONCAT3(icudtd,ICU_MAJOR,.dll)); @@ -209,7 +209,7 @@ End File gid_File_Lib_Icui18n PACKED_LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); + Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR)); #else #ifdef MSVC_PKG_DEBUG_RUNTIME Name = STRING(CONCAT3(icuind,ICU_MAJOR,.dll)); @@ -222,7 +222,7 @@ End File gid_File_Lib_Icuuc PACKED_LIB_FILE_BODY; #ifdef UNX - Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); + Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR)); #else #ifdef MSVC_PKG_DEBUG_RUNTIME Name = STRING(CONCAT3(icuucd,ICU_MAJOR,.dll)); diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 7a204dfbc8b5..1515de36fb39 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -18,46 +18,6 @@ #include "macros.inc" -#ifdef UNX -#ifndef SYSTEM_ICU - -Shortcut gid_Shortcut_Lib_Icudata - FileID = gid_File_Lib_Icudata; - Dir = SCP2_OOO_LIB_DIR; -#ifndef AIX - Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR)); -#else - Name = "libicudata.so"; -#endif - Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE); -End - -Shortcut gid_Shortcut_Lib_Icui18n - FileID = gid_File_Lib_Icui18n; - Dir = SCP2_OOO_LIB_DIR; -#ifndef AIX - Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR)); -#else - Name = "libicui18n.so"; -#endif - Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE); -End - -Shortcut gid_Shortcut_Lib_Icuuc - FileID = gid_File_Lib_Icuuc; - Dir = SCP2_OOO_LIB_DIR; -#ifndef AIX - Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR)); -#else - Name = "libicuuc.so"; -#endif - Styles = (NETWORK,RELATIVE,FORCE_INTO_UPDATE_PACKAGE); -End - -#endif - -#endif - #ifdef MACOSX #ifdef ENABLE_JAVA |