diff options
| author | David Tardon <dtardon@redhat.com> | 2013-04-01 13:17:02 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-05 23:31:31 +0000 |
| commit | 221cd46f47f40c892e554b0848978bda3d9957e1 (patch) | |
| tree | e38bd0635b2ef717361f896dddbd4eca628f2520 | |
| parent | 9924d6d61af506a6d9cb1fdbe35af220ad2135fb (diff) | |
move palettes.zip to package
Change-Id: Ide4e393ff2d735d9cdf01fcb489d65b7659acdbe
Reviewed-on: https://gerrit.libreoffice.org/3151
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_palettes.mk (renamed from extras/Zip_palettes.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 c3cb14b75b7c..c6d9744800a4 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -17,6 +17,7 @@ $(eval $(call gb_Module_add_targets,extras,\ Package_glade \ Package_labels \ Package_newfiles \ + Package_palettes \ Package_wordbook \ Zip_autocorr \ Zip_autotextuser \ @@ -33,7 +34,6 @@ $(eval $(call gb_Module_add_targets,extras,\ Zip_gallsystem \ Zip_gallwwwback \ Zip_gallwwwgraf \ - Zip_palettes \ Zip_tpllayoutimpr \ Zip_tplwizagenda \ Zip_tplwizbitmap \ diff --git a/extras/Zip_palettes.mk b/extras/Package_palettes.mk index e4cdaab85dd8..767fb785897b 100644 --- a/extras/Zip_palettes.mk +++ b/extras/Package_palettes.mk @@ -7,9 +7,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Zip_Zip,palettes,$(SRCDIR)/extras/source/palettes)) +$(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palettes)) -$(eval $(call gb_Zip_add_files,palettes,\ +$(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTDIR))) + +$(eval $(call gb_Package_add_files,extras_palettes,presets/config,\ arrowhd.soe \ classic.sog \ cmyk.soc \ diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp index 260c83546a0d..52dbff482c7d 100644 --- a/scp2/source/ooo/file_extra_ooo.scp +++ b/scp2/source/ooo/file_extra_ooo.scp @@ -297,10 +297,10 @@ File gid_File_Extra_Index_Pl End File gid_File_Extra_Palettes - Dir = gid_Dir_User_Config; + Dir = FILELIST_DIR; USER_FILE_BODY; - Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE); - Name = "palettes.zip"; + Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE); + Name = "extras_palettes.filelist"; Patchfiles = (); End |