diff options
| author | Eike Rathke <erack@redhat.com> | 2012-08-06 19:23:08 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2012-08-06 19:36:16 +0200 |
| commit | 284bc79cc482e95b216b6eeb9c166022880d662b (patch) | |
| tree | 5caa9044676b9da432b4f73dcef2e56f51de9ee4 /scp2 | |
| parent | a774a4826323ae2027e432da5d1a2a9d3356ad0d (diff) | |
install liblangtag and data
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 18 |
3 files changed, 27 insertions, 8 deletions
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index d453dbe600ae..e001c38564e7 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -671,6 +671,14 @@ Directory gid_Dir_Share_Autocorr Styles = (WORKSTATION, CREATE); End +#ifndef SYSTEM_LIBLANGTAG +Directory gid_Dir_Share_Liblangtag + ParentID = gid_Brand_Dir_Share; + DosName = "liblangtag"; + Styles = (WORKSTATION, CREATE); +End +#endif + Directory gid_Dir_Basic ParentID = gid_Brand_Dir_Share; DosName = "basic"; diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 1183ba69f956..903d23f7af78 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -144,6 +144,15 @@ File gid_File_Extra_Glas_Red_Zip Name = "glas-red.zip"; End +#ifndef SYSTEM_LIBLANGTAG +File gid_File_Extra_Liblangtag + Dir = gid_Dir_Share_Liblangtag; + USER_FILE_BODY; + Styles = (ARCHIVE); + Name = "liblangtag_data.zip"; +End +#endif + File gid_File_Extra_Round_Gorilla_Zip Dir = gid_Dir_Share_Config_Wizard_Web_Buttons; USER_FILE_BODY; diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index 5f307ca91743..79f48c510891 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -760,19 +760,21 @@ End #ifndef SYSTEM_LIBLANGTAG -#ifdef UNX File gid_File_Lib_Langtag LIB_FILE_BODY; - // FIXME: use version vars; NOTE: currently it's 0.1.0 despite of being 0.2.0 ... - Name = STRING(CONCAT8(liblangtag,UNXSUFFIX,.,0,.,1,.,0)); - Dir = SCP2_OOO_BIN_DIR; Styles = (PACKED); + Dir = SCP2_OOO_BIN_DIR; + #ifdef MACOSX + Name = STRING(CONCAT4(liblangtag,.,0,UNXSUFFIX)); + #elif defined WNT + // Nothing, statically linked to libi18nisolang1 + #else + // FIXME: use version vars + Name = STRING(CONCAT4(liblangtag,UNXSUFFIX,.,0)); + #endif End -#else - // WNT statically linked to libi18nisolang1 -#endif -#endif +#endif // SYSTEM_LIBLANGTAG #ifdef SOLAR_JAVA |