diff options
| -rw-r--r-- | extras/Module_extras.mk | 2 | ||||
| -rw-r--r-- | extras/Package_database.mk (renamed from extras/Zip_database.mk) | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 977c47520880..3de16a4dd8a6 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -20,11 +20,11 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_newfiles \ Package_palettes \ Package_wordbook \ + Package_database \ Zip_autotextuser \ Zip_cfgsrvbitmapunx \ Zip_cfgsrvnolang \ Zip_cfgusr \ - Zip_database \ Zip_databasebiblio \ Zip_gallbullets \ Zip_gallhtmlexpo \ diff --git a/extras/Zip_database.mk b/extras/Package_database.mk index b35e3aa15912..03800f57c6a6 100644 --- a/extras/Zip_database.mk +++ b/extras/Package_database.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,database,$(SRCDIR)/extras/source/database)) +$(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/database)) -$(eval $(call gb_Zip_add_files,database,\ +$(eval $(call gb_Package_set_outdir,extras_database,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_database,presets/database,\ biblio.odb \ evolocal.odb \ )) diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 2eef8a57557e..67f769c932c4 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -86,10 +86,10 @@ File gid_File_Extra_Common_Pl End File gid_File_Extra_Database - Dir = gid_Dir_Database; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - Name = "database.zip"; + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Name = "extras_database.filelist"; End File gid_File_Extra_Databasebiblio |