diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2013-04-13 02:34:16 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-04-14 08:53:48 +0000 |
| commit | 712acdd7dbbaa94b299c1ae739d4081f2f057b27 (patch) | |
| tree | 8cebc58ef9004e8339d361e84848b2e8925496ff /extras | |
| parent | 31d81f87dd8f6aef1eceac4989e77a7cc6a1bc57 (diff) | |
fdo#63197, Convert Zip_cfgsrvbitmapunx, Zip_cfgsrvnolang and Zip_cfgusr
Change-Id: I11064116d44f4e45676553dd26a9fe75376d923f
Reviewed-on: https://gerrit.libreoffice.org/3368
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'extras')
| -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 |
4 files changed, 18 insertions, 12 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 \ )) |