extras/Module_extras.mk | 2 +- extras/Package_autotextuser.mk | 18 ++++++++++++++++++ extras/Zip_autotextuser.mk | 16 ---------------- scp2/source/ooo/file_extra_ooo.scp | 6 +++--- 4 files changed, 22 insertions(+), 20 deletions(-)
New commits: commit e7111979c6ca1d935662fa13f603847967c5562f Author: Julien Nabet <[email protected]> Date: Thu Apr 11 22:20:41 2013 +0200 fdo#63197, Convert Zip_autotextuser Change-Id: I6a7764637f6e5754e68ee6e4ab417224f542592d Reviewed-on: https://gerrit.libreoffice.org/3348 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index ece5397..cd07e66 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/Package_autotextuser.mk b/extras/Package_autotextuser.mk new file mode 100644 index 0000000..7df6c3a --- /dev/null +++ b/extras/Package_autotextuser.mk @@ -0,0 +1,18 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/autotext)) + +$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_autotextuser,presets/autotext,\ + mytexts.bau \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/extras/Zip_autotextuser.mk b/extras/Zip_autotextuser.mk deleted file mode 100644 index 9decaae..0000000 --- a/extras/Zip_autotextuser.mk +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# 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_Zip_add_files,autotextuser,\ - mytexts.bau \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index e2ac274..bb15b33 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 _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
