diff options
| -rw-r--r-- | extras/Module_extras.mk | 2 | ||||
| -rw-r--r-- | extras/Package_autotextuser.mk (renamed from extras/Zip_autotextuser.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 ece5397ddc09..cd07e662e009 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -22,7 +22,7 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_wordbook \ Package_database \ Package_databasebiblio \ - Zip_autotextuser \ + Package_autotextuser \ Zip_cfgsrvbitmapunx \ Zip_cfgsrvnolang \ Zip_cfgusr \ diff --git a/extras/Zip_autotextuser.mk b/extras/Package_autotextuser.mk index 9decaaea7699..7df6c3a0b5e5 100644 --- a/extras/Zip_autotextuser.mk +++ b/extras/Package_autotextuser.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,autotextuser,$(SRCDIR)/extras/source/autotext)) +$(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext)) -$(eval $(call gb_Zip_add_files,autotextuser,\ +$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_autotextuser,presets/autotext,\ mytexts.bau \ )) diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index e2ac274a05db..bb15b33fce10 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -42,10 +42,10 @@ File gid_File_Extra_Autotextshare_Lang End File gid_File_Extra_Autotextuser - Dir = gid_Dir_User_Autotext; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE, WORKSTATION, DOCLANG, DONT_OVERWRITE); - Name = "autotextuser.zip"; + Styles = (FILELIST, WORKSTATION, DOCLANG, DONT_OVERWRITE); + Name = "extras_autotextuser.filelist"; End #ifdef UNX |