diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-03-18 17:38:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-03-18 22:18:10 +0100 |
| commit | 01adcd8024f496c36f0d6caac2f063d048fa90e0 (patch) | |
| tree | 3a7cd8cbaecd6368bf228666d094e1995674a713 | |
| parent | 0c94f23959cd923ce642704ab9d64ab35948efec (diff) | |
scp2: move liblangtag to AutoInstall
Change-Id: If79d57cf1743427106c0e4202fb4d5e42b5a807e
| -rw-r--r-- | RepositoryExternal.mk | 4 | ||||
| -rw-r--r-- | scp2/InstallModule_ooo.mk | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 9 |
4 files changed, 4 insertions, 19 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index f55e5850e172..a10264164c55 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -993,6 +993,10 @@ endef else # !SYSTEM_LIBLANGTAG +$(eval $(call gb_Helper_register_packages_for_install,ooo,\ + liblangtag_data \ +)) + define gb_LinkTarget__use_liblangtag $(call gb_LinkTarget_use_unpacked,$(1),langtag) $(call gb_LinkTarget_set_include,$(1),\ diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index d76394ce91af..6a4eb7efa1e3 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -23,7 +23,6 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_GTK \ ENABLE_KDE \ - ENABLE_LIBLANGTAG \ ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ ENABLE_MACOSX_SANDBOX \ ENABLE_NPAPI_FROM_BROWSER \ @@ -46,7 +45,6 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ SYSTEM_LCMS2 \ SYSTEM_LIBEXTTEXTCAT \ SYSTEM_LIBJPEG \ - SYSTEM_LIBLANGTAG \ SYSTEM_LIBXML \ SYSTEM_LIBXSLT \ SYSTEM_LUCENE \ diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index eb51cd84ba1c..322f28209ebe 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -242,14 +242,6 @@ Directory gid_Dir_Autotext DosName = "autotext"; End -#if defined( ENABLE_LIBLANGTAG ) && !defined( 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 f1cb3b43948f..62714c75313f 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -85,15 +85,6 @@ File gid_File_Extra_Databasebiblio Name = "extras_databasebiblio.filelist"; End -#if defined( ENABLE_LIBLANGTAG ) && !defined( SYSTEM_LIBLANGTAG ) -File gid_File_Extra_Liblangtag - Dir = FILELIST_DIR; - USER_FILE_BODY; - Styles = (FILELIST); - Name = "liblangtag_data.filelist"; -End -#endif - #ifdef UNX #ifndef WITHOUT_PPDS |