install soffice script into instdir

Change-Id: Id55fc6efcd957de926df79ca02200f4fda7c56b0

desktop/Package_soffice_sh.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_workdir,desktop/soffice)))
 
-$(eval $(call gb_Package_add_file,desktop_soffice_sh,bin/soffice,soffice.sh))
+$(eval $(call gb_Package_set_outdir,desktop_soffice_sh,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,desktop_soffice_sh,$(gb_PROGRAMDIRNAME)/soffice,soffice.sh))
 
 # vim:set noet sw=4 ts=4:

scp2/source/ooo/common_brand.scp

@@ -500,6 +500,17 @@ End
 
 #endif
 
+#if !defined MACOSX && !defined WNT
+
+File gid_Brand_File_Bin_Soffice
+    BIN_FILE_BODY;
+    Dir = FILELIST_DIR;
+    Name = "desktop_soffice_sh.filelist";
+    Styles = (FILELIST, PACKED);
+End
+
+#else
+
 File gid_Brand_File_Bin_Soffice
     BIN_FILE_BODY;
     Dir = gid_Brand_Dir_Program;
@@ -513,6 +524,8 @@ File gid_Brand_File_Bin_Soffice
 #endif
 End
 
+#endif
+
 #if defined(UNX) && !defined(MACOSX) && !defined(LIBO_HEADLESS)
 File gid_Brand_File_Bin_Spadmin
     BIN_FILE_BODY;