install xmlscript DTDs using filelist

Change-Id: Ie773f7af8823534e9d4834733b4852cb9ad314ae

scp2/source/ooo/file_ooo.scp

@@ -249,25 +249,11 @@ File gid_File_framework_dtd
     Name = "framework_dtd.filelist";
 End
 
-File gid_File_Dtd_Dialog
+File gid_File_xmlscript_dtd
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "dialog.dtd";
-End
-
-File gid_File_Dtd_Libraries
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "libraries.dtd";
-End
-
-File gid_File_Dtd_Library
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "library.dtd";
+    Styles = (FILELIST, PACKED);
+    Dir = FILELIST_DIR;
+    Name = "xmlscript_dtd.filelist";
 End
 
 File gid_File_Dtd_Manifest
@@ -277,13 +263,6 @@ File gid_File_Dtd_Manifest
     Name = "package_dtd.filelist";
 End
 
-File gid_File_Dtd_Module
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Dtd_Ooo_1_0;
-    Name = "module.dtd";
-End
-
 STD_RES_FILE( gid_File_Res_Eps, eps )
 
 File gid_File_Help_Help_Zip

scp2/source/ooo/module_hidden_ooo.scp

@@ -404,11 +404,8 @@ Module gid_Module_Root_Files_6
         gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
         gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
 	gid_File_framework_dtd,
-	gid_File_Dtd_Dialog,
-	gid_File_Dtd_Libraries,
-	gid_File_Dtd_Library,
+	gid_File_xmlscript_dtd,
 	gid_File_Dtd_Manifest,
-	gid_File_Dtd_Module,
 	gid_File_xmloff_dtd,
 	gid_File_officecfg_misc,
     gid_File_Share_Glade_Xml,

xmlscript/Package_dtd.mk

@@ -9,9 +9,13 @@
 
 $(eval $(call gb_Package_Package,xmlscript_dtd,$(SRCDIR)/xmlscript))
 
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/dialog.dtd,dtd/dialog.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/libraries.dtd,dtd/libraries.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/library.dtd,dtd/library.dtd))
-$(eval $(call gb_Package_add_file,xmlscript_dtd,bin/module.dtd,dtd/module.dtd))
+$(eval $(call gb_Package_set_outdir,xmlscript_dtd,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,xmlscript_dtd,share/dtd/officedocument/1_0,\
+	dtd/dialog.dtd \
+	dtd/libraries.dtd \
+	dtd/library.dtd \
+	dtd/module.dtd \
+))
 
 # vim: set noet sw=4 ts=4: