install framework DTDs using filelist

Change-Id: I7a36eb26d26dfa58b82919ca0ee16f94fa82c220

framework/Package_dtd.mk

@@ -18,12 +18,17 @@
 #
 
 $(eval $(call gb_Package_Package,framework_dtd,$(SRCDIR)/framework/dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/accelerator.dtd,accelerator.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/event.dtd,event.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/groupuinames.dtd,groupuinames.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/image.dtd,image.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/menubar.dtd,menubar.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/statusbar.dtd,statusbar.dtd))
-$(eval $(call gb_Package_add_file,framework_dtd,bin/toolbar.dtd,toolbar.dtd))
+
+$(eval $(call gb_Package_set_outdir,framework_dtd,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,framework_dtd,share/dtd/officedocument/1_0,\
+	accelerator.dtd \
+	event.dtd \
+	groupuinames.dtd \
+	image.dtd \
+	menubar.dtd \
+	statusbar.dtd \
+	toolbar.dtd \
+))
 
 # vim: set noet sw=4 ts=4:

scp2/source/ooo/file_ooo.scp

@@ -256,11 +256,11 @@ End
 
 #endif
 
-File gid_File_Dtd_Accelerator
+File gid_File_framework_dtd
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "accelerator.dtd";
+    Styles = (FILELIST, PACKED);
+    Dir = FILELIST_DIR;
+    Name = "framework_dtd.filelist";
 End
 
 File gid_File_Dtd_Dialog
@@ -270,27 +270,6 @@ File gid_File_Dtd_Dialog
     Name = "dialog.dtd";
 End
 
-File gid_File_Dtd_Event
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "event.dtd";
-End
-
-File gid_File_Dtd_Groupuinames
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "groupuinames.dtd";
-End
-
-File gid_File_Dtd_Image
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "image.dtd";
-End
-
 File gid_File_Dtd_Libraries
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -312,13 +291,6 @@ File gid_File_Dtd_Manifest
     Name = "Manifest.dtd";
 End
 
-File gid_File_Dtd_Menubar
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "menubar.dtd";
-End
-
 File gid_File_Dtd_Module
     TXT_FILE_BODY;
     Styles = (PACKED);
@@ -326,20 +298,6 @@ File gid_File_Dtd_Module
     Name = "module.dtd";
 End
 
-File gid_File_Dtd_Statusbar
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "statusbar.dtd";
-End
-
-File gid_File_Dtd_Toolbar
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "toolbar.dtd";
-End
-
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
 File gid_File_Help_Help_Zip

scp2/source/ooo/module_hidden_ooo.scp

@@ -406,18 +406,12 @@ Module gid_Module_Root_Files_6
         gid_File_Share_Config_Sofficecfg_uiconfig_uui,
         gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
         gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
-	gid_File_Dtd_Accelerator,
+	gid_File_framework_dtd,
 	gid_File_Dtd_Dialog,
-	gid_File_Dtd_Event,
-	gid_File_Dtd_Groupuinames,
-	gid_File_Dtd_Image,
 	gid_File_Dtd_Libraries,
 	gid_File_Dtd_Library,
 	gid_File_Dtd_Manifest,
-	gid_File_Dtd_Menubar,
 	gid_File_Dtd_Module,
-	gid_File_Dtd_Statusbar,
-	gid_File_Dtd_Toolbar,
 	gid_File_xmloff_dtd,
 	gid_File_officecfg_misc,
     gid_File_Share_Glade_Xml,