diff options
| -rw-r--r-- | extras/Module_extras.mk | 12 | ||||
| -rw-r--r-- | extras/Package_cfgsrvbitmapunx.mk (renamed from extras/Zip_cfgsrvbitmapunx.mk) | 6 | ||||
| -rw-r--r-- | extras/Package_cfgsrvnolang.mk (renamed from extras/Zip_cfgsrvnolang.mk) | 6 | ||||
| -rw-r--r-- | extras/Package_cfgusr.mk (renamed from extras/Zip_cfgusr.mk) | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/file_extra_ooo.scp | 19 |
5 files changed, 28 insertions, 21 deletions
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 6597afd1eaf6..8df931ce4764 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -14,18 +14,18 @@ $(eval $(call gb_Module_add_targets,extras,\ CustomTarget_autocorr \ CustomTarget_glade \ Package_autocorr \ + Package_autotextuser \ + Package_cfgsrvbitmapunx \ + Package_cfgsrvnolang \ + Package_cfgusr \ + Package_database \ + Package_databasebiblio \ Package_fonts \ Package_glade \ Package_labels \ Package_newfiles \ Package_palettes \ Package_wordbook \ - Package_database \ - Package_databasebiblio \ - Package_autotextuser \ - Zip_cfgsrvbitmapunx \ - Zip_cfgsrvnolang \ - Zip_cfgusr \ Zip_gallbullets \ Zip_gallhtmlexpo \ Zip_gallroot \ diff --git a/extras/Zip_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk index 3b7ce9b92141..1d617969f87f 100644 --- a/extras/Zip_cfgsrvbitmapunx.mk +++ b/extras/Package_cfgsrvbitmapunx.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps)) +$(eval $(call gb_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/source/bitmaps)) -$(eval $(call gb_Zip_add_files,cfgsrvbitmapunx,\ +$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,share/config,\ psetupl.xpm \ psetup.xpm \ )) diff --git a/extras/Zip_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk index d15b0a6cac3f..603a44479243 100644 --- a/extras/Zip_cfgsrvnolang.mk +++ b/extras/Package_cfgsrvnolang.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,cfgsrvnolang,$(SRCDIR)/extras/source/misc_config)) +$(eval $(call gb_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/misc_config)) -$(eval $(call gb_Zip_add_files,cfgsrvnolang,\ +$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTDIR))) + +$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,share/config,\ wizard/form/styles/beige.css \ wizard/form/styles/bgr.css \ wizard/form/styles/dark.css \ diff --git a/extras/Zip_cfgusr.mk b/extras/Package_cfgusr.mk index 87330c69bac5..45ec35147196 100644 --- a/extras/Zip_cfgusr.mk +++ b/extras/Package_cfgusr.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,cfgusr,$(SRCDIR)/extras/source/misc_config)) +$(eval $(call gb_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_config)) -$(eval $(call gb_Zip_add_files,cfgusr,\ +$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_cfgusr,presets/config,\ autotbl.fmt \ )) diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 3f965a6cc7c4..bb33bd2fb4c8 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -51,25 +51,26 @@ End #ifdef UNX File gid_File_Extra_Cfgsrv_Bitmap_Unx - Dir = gid_Brand_Dir_Share_Config; - ARCHIVE_TXT_FILE_BODY; - Name = "cfgsrvbitmapunx.zip"; + Dir = FILELIST_DIR; + TXT_FILE_BODY; + Styles = (FILELIST); + Name = "extras_cfgsrvbitmapunx.filelist"; End #endif File gid_File_Extra_Cfgusr - Dir = gid_Dir_User_Config; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - Name = "cfgusr.zip"; + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Name = "extras_cfgusr.filelist"; End File gid_File_Extra_Cfgsrv - Dir = gid_Brand_Dir_Share_Config; + Dir = FILELIST_DIR; TXT_FILE_BODY; - Styles = (ARCHIVE); - Name = "cfgsrvnolang.zip"; + Styles = (FILELIST); + Name = "extras_cfgsrvnolang.filelist"; Patchfiles = (); End |