diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-04-10 23:03:04 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-11 03:29:56 +0000 |
| commit | 283ce0b6192c1a5baf10d603a3d6606fe06d1116 (patch) | |
| tree | 6f3065ddbe20ea5fee84724dfb5599e1c7d263f2 | |
| parent | a7e61eab07832a55427a8b532d9e2bf27929e446 (diff) | |
fdo#63197, Convert Zip_databasebiblio
Change-Id: I58d387c4bbfd4af9cc1e800bc8c715e34a61a970
Reviewed-on: https://gerrit.libreoffice.org/3318
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | extras/Module_extras.mk | 2 | ||||
| -rw-r--r-- | extras/Package_databasebiblio.mk (renamed from extras/Zip_databasebiblio.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 3de16a4dd8a6..ece5397ddc09 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -21,11 +21,11 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_palettes \ Package_wordbook \ Package_database \ + Package_databasebiblio \ Zip_autotextuser \ Zip_cfgsrvbitmapunx \ Zip_cfgsrvnolang \ Zip_cfgusr \ - Zip_databasebiblio \ Zip_gallbullets \ Zip_gallhtmlexpo \ Zip_gallroot \ diff --git a/extras/Zip_databasebiblio.mk b/extras/Package_databasebiblio.mk index 2db36538eb5e..a85c19332b37 100644 --- a/extras/Zip_databasebiblio.mk +++ b/extras/Package_databasebiblio.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,databasebiblio,$(SRCDIR)/extras/source/database)) +$(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/database)) -$(eval $(call gb_Zip_add_files,databasebiblio,\ +$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_databasebiblio,presets/database/biblio,\ biblio.dbf \ biblio.dbt \ )) diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 67f769c932c4..e2ac274a05db 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -93,10 +93,10 @@ File gid_File_Extra_Database End File gid_File_Extra_Databasebiblio - Dir = gid_Dir_Database_Biblio; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - Name = "databasebiblio.zip"; + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Name = "extras_databasebiblio.filelist"; End File gid_File_Extra_Edit_Asp |