install data files from extras using filelists

Change-Id: Ib092623501e36fa759a5215a435d21e1fea8dfdd

extras/Package_glade.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir,extras/source/glade)))
 
-$(eval $(call gb_Package_add_file,extras_glade,pck/libreoffice-catalog.xml,libreoffice-catalog.xml))
+$(eval $(call gb_Package_set_outdir,extras_glade,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extras_glade,share/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
 
 # vim: set noet sw=4 ts=4:

extras/Package_labels.mk

@@ -9,6 +9,8 @@
 
 $(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels))
 
-$(eval $(call gb_Package_add_file,extras_labels,pck/labels.xml,labels.xml))
+$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_file,extras_labels,share/labels/labels.xml,labels.xml))
 
 # vim: set noet sw=4 ts=4:

extras/Package_newfiles.mk

@@ -9,7 +9,9 @@
 
 $(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellnew))
 
-$(eval $(call gb_Package_add_files,extras_newfiles,pck,\
+$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_newfiles,share/template/shellnew,\
     soffice.odg \
     soffice.odp \
     soffice.ods \

scp2/inc/macros.inc

@@ -161,17 +161,6 @@
 
 #define JARFILENAME(name) STRING(CONCAT2(name,.jar))
 
-#define PACKED_SHELLNEW_FILE_BODY \
-        TXT_FILE_BODY; \
-        Styles = (PACKED,WORKSTATION, OVERWRITE); \
-        Dir    = gid_Dir_Shellnew
-
-#define STD_SHELLNEW_FILE(id,name) \
-    File id \
-        PACKED_SHELLNEW_FILE_BODY; \
-        Name      = STRING(name) ; \
-    End
-
 #define SPECIAL_COMPONENT_LIB_FILE(id,name) \
     File id \
         Name     = SPECIAL_COMPONENT_LIB_NAME(name); \

scp2/source/ooo/file_ooo.scp

@@ -506,16 +506,16 @@ End
 
 File gid_File_Share_Labels_Xml
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Labels;
-    Name = "labels.xml";
+    Styles = (FILELIST, PACKED);
+    Dir = FILELIST_DIR;
+    Name = "extras_labels.filelist";
 End
 
 File gid_File_Share_Glade_Xml
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Brand_Dir_Share_Glade;
-    Name = "libreoffice-catalog.xml";
+    Styles = (FILELIST, PACKED);
+    Dir = FILELIST_DIR;
+    Name = "extras_glade.filelist";
 End
 
 File gid_File_Share_Registry_Main_Xcd
@@ -710,10 +710,12 @@ UI_FILELIST_ALL_LANG(xmlsec, UIConfig/xmlsec, filelist)
 
 #ifdef WNT
 
-STD_SHELLNEW_FILE(gid_File_Shellnew_Ods_Soffice, soffice.ods)
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odg_Soffice, soffice.odg)
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odp_Soffice, soffice.odp)
-STD_SHELLNEW_FILE(gid_File_Shellnew_Odt_Soffice, soffice.odt)
+File gid_File_extras_newfiles
+    TXT_FILE_BODY;
+    Styles = (FILELIST, PACKED, WORKSTATION, OVERWRITE);
+    Dir = FILELIST_DIR;
+    Name = "extras_newfiles.filelist";
+End
 
 #endif
 

scp2/source/ooo/module_hidden_ooo.scp

@@ -107,10 +107,7 @@ Module gid_Module_Root_Files_2
 	gid_File_Txt_Pagein_Draw,
 	gid_File_Txt_Pagein_Impress,
 	gid_File_Txt_Pagein_Writer,
-	gid_File_Shellnew_Ods_Soffice,
-	gid_File_Shellnew_Odg_Soffice,
-	gid_File_Shellnew_Odp_Soffice,
-	gid_File_Shellnew_Odt_Soffice);
+	gid_File_extras_newfiles);
 End
 
 Module gid_Module_Root_Files_3