diff options
| -rw-r--r-- | officecfg/Package_misc.mk | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 15 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
3 files changed, 9 insertions, 15 deletions
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk index 9e842252ae05..b4e8bd55b89b 100644 --- a/officecfg/Package_misc.mk +++ b/officecfg/Package_misc.mk @@ -19,7 +19,9 @@ $(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg)) -$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample)) -$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample)) +$(eval $(call gb_Package_set_outdir,officecfg_misc,$(INSTDIR))) + +$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample)) +$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample)) # vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index 283038278eb3..fb2b35eefeca 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -634,18 +634,11 @@ End #endif -File gid_File_Oo_Ldap_Xcd_Sample +File gid_File_officecfg_misc TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry; - Name = "oo-ldap.xcd.sample"; -End - -File gid_File_Oo_Ad_Ldap_Xcd_Sample - TXT_FILE_BODY; - Styles = (PACKED); - Dir = gid_Brand_Dir_Share_Registry; - Name = "oo-ad-ldap.xcd.sample"; + Styles = (FILELIST, PACKED); + Dir = FILELIST_DIR; + Name = "officecfg_misc.filelist"; End File gid_File_Rdb_Offapi diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp index 0590f9c3f850..ddd1157d41cc 100644 --- a/scp2/source/ooo/module_hidden_ooo.scp +++ b/scp2/source/ooo/module_hidden_ooo.scp @@ -455,8 +455,7 @@ Module gid_Module_Root_Files_6 gid_File_Mod_Style, gid_File_Mod_Table, gid_File_Mod_Text, - gid_File_Oo_Ldap_Xcd_Sample, - gid_File_Oo_Ad_Ldap_Xcd_Sample, + gid_File_officecfg_misc, gid_File_Share_Glade_Xml, gid_File_Share_Labels_Xml, gid_File_Share_Registry_Main_Xcd, |