diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-14 12:48:20 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-15 21:32:37 +0200 |
| commit | 9555b5bdb9ce2251bb8c4f967f20ed1b13eecf5e (patch) | |
| tree | 217eb6f8a01586eff83babf32e31addd500bd1f8 /scp2 | |
| parent | 944f3a6c6e48f1b5532fa16ab38918b9b3f9412e (diff) | |
Add gengal to RepositoryFixes and autoinstall it.
Change-Id: I935fb9fd2620447f9aba9142b7db896e6fe31133
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/AutoInstall.mk | 2 | ||||
| -rwxr-xr-x | scp2/inc/macros.inc | 8 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 11 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 1 |
4 files changed, 9 insertions, 13 deletions
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk index 3dfb56a2587e..66edd78ecf5a 100644 --- a/scp2/AutoInstall.mk +++ b/scp2/AutoInstall.mk @@ -17,7 +17,7 @@ $(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE)) -$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE)) +$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE)) $(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE)) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 99f0d98d30d9..86b4b5462188 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -453,6 +453,14 @@ End Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); \ End +#define LIBO_EXECUTABLE(id,name) \ + File id \ + BIN_FILE_BODY; \ + Dir = gid_Brand_Dir_Program; \ + Name = name; \ + Styles = (PACKED); \ + End + #define GALLERY_NAME(id) \ #define GALLERY_FILELIST(id) \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a191c49a7616..256636de3a84 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -128,17 +128,6 @@ File gid_File_Exe_Nsplugin End #endif -File gid_File_Bin_Gengal - BIN_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); - #ifdef UNX - Name = "gengal.bin"; - #else - Name = "gengal.exe"; - #endif -End - File gid_File_Bin_UIPreviewer BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index bc3eda5d6395..52894dd323fc 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -84,7 +84,6 @@ Module gid_Module_Root_Files_2 Files = (gid_File_shell_scripts, gid_File_Bin_Pluginapp, gid_File_Bin_Senddoc, - gid_File_Bin_Gengal, gid_File_Script_Gengal, gid_File_Bin_Spadmin_Bin, gid_File_Bin_Uri_Encode, |