install impress xml config files using filelists

Change-Id: I072d5283f979b42ffbd359575209c09cf445b6df

6 files changed, 34 insertions, 18 deletions

diff --git a/scp2/source/impress/file_impress.scp b/scp2/source/impress/file_impress.scp
index 775333532866..bff0354d6bef 100644
--- a/scp2/source/impress/file_impress.scp
+++ b/scp2/source/impress/file_impress.scp
@@ -63,16 +63,9 @@ End
 
 // configuration files for custom animation effects
 
-File gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml
+File gid_File_sd_xml
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
-    Name = "effects.xml";
-End
-
-File gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml
-    TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
-    Name = "transitions.xml";
+    Styles = (FILELIST, PACKED);
+    Dir = FILELIST_DIR;
+    Name = "sd_xml.filelist";
 End
diff --git a/scp2/source/impress/module_impress.scp b/scp2/source/impress/module_impress.scp
index f306dc81bb33..29164ac16a6c 100644
--- a/scp2/source/impress/module_impress.scp
+++ b/scp2/source/impress/module_impress.scp
@@ -45,7 +45,8 @@ Module gid_Module_Prg_Impress_Bin
     Files = (gid_File_Extra_Urldesktop_Impress,gid_File_Extra_Urlnew_Impress,gid_File_Extra_Urlstart_Impress,gid_File_Extra_Urltasks_Impress,gid_File_Lib_Placeware,
     gid_File_Lib_PresenterScreen,
     gid_File_Share_Registry_Impress_Xcd,
-    gid_File_Lib_Animcore,gid_File_Share_Config_Sofficecfg_Impress_Effects_Xml, gid_File_Share_Config_Sofficecfg_Impress_Transitions_Xml,
+    gid_File_Lib_Animcore,
+    gid_File_sd_xml,
     gid_File_Tmp_Userinstall_Impress_Inf);
 End
 
diff --git a/scp2/source/impress/module_ogltrans.scp b/scp2/source/impress/module_ogltrans.scp
index ade2e742ca03..3ae1bfd15fb6 100644
--- a/scp2/source/impress/module_ogltrans.scp
+++ b/scp2/source/impress/module_ogltrans.scp
@@ -41,9 +41,9 @@ STD_LIB_FILE(gid_File_Lib_OpenGLTransitions, OGLTrans)
 
 File gid_File_Share_Config_Sofficecfg_Impress_Transitions_OGL_Xml
     TXT_FILE_BODY;
-    Styles = (PACKED);
-    Dir = gid_Dir_Share_Config_Sofficecfg_Simpress;
-    Name = "transitions-ogl.xml";
+    Styles = (FILELIST,PACKED);
+    Dir = FILELIST_DIR;
+    Name = "sd_opengl.filelist";
 End
 
 File gid_File_Share_Registry_Ogltrans_Xcd
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 5b19b2c211b5..64c6fe9ed1d9 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_Module_add_targets,sd,\
     Library_sdd \
     Library_sdfilt \
     Library_sdui \
+    Package_opengl \
     Package_web \
     Package_xml \
     UIConfig_sdraw \
diff --git a/sd/Package_opengl.mk b/sd/Package_opengl.mk
new file mode 100644
index 000000000000..15a33da7dbfc
--- /dev/null
+++ b/sd/Package_opengl.mk
@@ -0,0 +1,18 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,sd_opengl,$(SRCDIR)/sd/xml))
+
+$(eval $(call gb_Package_set_outdir,sd_opengl,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sd_opengl,share/config/soffice.cfg/simpress,\
+	transitions-ogl.xml \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index b6a0e091900c..94e96075d146 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -9,8 +9,11 @@
 
 $(eval $(call gb_Package_Package,sd_xml,$(SRCDIR)/sd/xml))
 
-$(eval $(call gb_Package_add_file,sd_xml,xml/effects.xml,effects.xml))
-$(eval $(call gb_Package_add_file,sd_xml,xml/transitions-ogl.xml,transitions-ogl.xml))
-$(eval $(call gb_Package_add_file,sd_xml,xml/transitions.xml,transitions.xml))
+$(eval $(call gb_Package_set_outdir,sd_xml,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,sd_xml,share/config/soffice.cfg/simpress,\
+	effects.xml \
+	transitions.xml \
+))
 
 # vim: set noet sw=4 ts=4: