diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-01 09:38:35 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-05 23:35:14 +0000 |
| commit | a593069ff9f64dd94e8210b0cff03b65fe059b40 (patch) | |
| tree | a730dfa2e02b6dc8a3452fb129a554936e03351e | |
| parent | e9b947a6665170f96ba4182d81a630da74ea96a2 (diff) | |
move autocorr.zip to package
Change-Id: Ia032d3cb3c41a654ab42b9fe5b2d79bc7ca713f1
Reviewed-on: https://gerrit.libreoffice.org/3150
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | extras/Module_extras.mk | 2 | ||||
| -rw-r--r-- | extras/Package_autocorr.mk (renamed from extras/Zip_autocorr.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 c6d9744800a4..977c47520880 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -13,13 +13,13 @@ $(eval $(call gb_Module_add_targets,extras,\ AllLangZip_autotextshare \ CustomTarget_autocorr \ CustomTarget_glade \ + Package_autocorr \ Package_fonts \ Package_glade \ Package_labels \ Package_newfiles \ Package_palettes \ Package_wordbook \ - Zip_autocorr \ Zip_autotextuser \ Zip_cfgsrvbitmapunx \ Zip_cfgsrvnolang \ diff --git a/extras/Zip_autocorr.mk b/extras/Package_autocorr.mk index adf5651bb9ef..87ab16a96a5a 100644 --- a/extras/Zip_autocorr.mk +++ b/extras/Package_autocorr.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext))) +$(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_workdir,extras/source/autotext))) -$(eval $(call gb_Zip_add_files,autocorr,\ +$(eval $(call gb_Package_set_outdir,extras_autocorr,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_autocorr,share/autocorr,\ acor_af-ZA.dat \ acor_bg-BG.dat \ acor_cs-CZ.dat \ diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 52dbff482c7d..2eef8a57557e 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -28,10 +28,10 @@ #include "macros.inc" File gid_File_Extra_Autocorr - Dir = gid_Dir_Share_Autocorr; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE); - Name = "autocorr.zip"; + Styles = (FILELIST); + Name = "extras_autocorr.filelist"; End File gid_File_Extra_Autotextshare_Lang |