9 files changed, 40 insertions, 24 deletions
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 8df931ce4764..348b62db8587 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -21,19 +21,19 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_database \
 	Package_databasebiblio \
 	Package_fonts \
+	Package_gallbullets \
+	Package_gallhtmlexpo \
+	Package_gallroot \
+	Package_gallsound \
+	Package_gallsounds \
+	Package_gallsystem \
+	Package_gallwwwback \
+	Package_gallwwwgraf \
 	Package_glade \
 	Package_labels \
 	Package_newfiles \
 	Package_palettes \
 	Package_wordbook \
-	Zip_gallbullets \
-	Zip_gallhtmlexpo \
-	Zip_gallroot \
-	Zip_gallsound \
-	Zip_gallsounds \
-	Zip_gallsystem \
-	Zip_gallwwwback \
-	Zip_gallwwwgraf \
 	Zip_tpllayoutimpr \
 	Zip_tplwizagenda \
 	Zip_tplwizbitmap \
diff --git a/extras/Zip_gallbullets.mk b/extras/Package_gallbullets.mk
index 81fcc7589e7c..c5d903f47a45 100644
--- a/extras/Zip_gallbullets.mk
+++ b/extras/Package_gallbullets.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
+$(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
 
-$(eval $(call gb_Zip_add_files,gallbullets,\
+$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallbullets,share/gallery/bullets,\
 	blkpearl.gif \
 	bluarrow.gif \
 	bluball.gif \
diff --git a/extras/Zip_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
index ad2ff4125edd..f0531c5678a0 100644
--- a/extras/Zip_gallhtmlexpo.mk
+++ b/extras/Package_gallhtmlexpo.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
+$(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
 
-$(eval $(call gb_Zip_add_files,gallhtmlexpo,\
+$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,share/gallery/htmlexpo,\
 	bludown.gif \
 	blufirs_.gif \
 	blufirs.gif \
diff --git a/extras/Zip_gallroot.mk b/extras/Package_gallroot.mk
index c5f21bf9512b..cb1ae1b84229 100644
--- a/extras/Zip_gallroot.mk
+++ b/extras/Package_gallroot.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallroot,$(SRCDIR)/extras/source/gallery))
+$(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery))
 
-$(eval $(call gb_Zip_add_files,gallroot,\
+$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallroot,share/gallery,\
 	apples.gif \
 	bigapple.gif \
 	flower.gif \
diff --git a/extras/Zip_gallsound.mk b/extras/Package_gallsound.mk
index 0129923dd98f..b535edacb098 100644
--- a/extras/Zip_gallsound.mk
+++ b/extras/Package_gallsound.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound))
+$(eval $(call gb_Package_Package,extras_gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound))
 
-$(eval $(call gb_Zip_add_files,gallsound,\
+$(eval $(call gb_Package_set_outdir,extras_gallsound,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsound,presets/gallery,\
 	sg100.sdv \
 	sg100.thm \
 	sg30.sdv \
diff --git a/extras/Zip_gallsounds.mk b/extras/Package_gallsounds.mk
index 3021c7964484..61a093f9f4e0 100644
--- a/extras/Zip_gallsounds.mk
+++ b/extras/Package_gallsounds.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallsounds,$(SRCDIR)/extras/source/gallery/sounds))
+$(eval $(call gb_Package_Package,extras_gallsounds,$(SRCDIR)/extras/source/gallery/sounds))
 
-$(eval $(call gb_Zip_add_files,gallsounds,\
+$(eval $(call gb_Package_set_outdir,extras_gallsounds,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsounds,share/gallery/sounds,\
 	apert2.wav \
 	apert.wav \
 	applause.wav \
diff --git a/extras/Zip_gallsystem.mk b/extras/Package_gallsystem.mk
index bb55713305cd..21771d4379c5 100644
--- a/extras/Zip_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
+$(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
 
-$(eval $(call gb_Zip_add_files,gallsystem,\
+$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
 	sg1.sdg \
 	sg1.sdv \
 	sg1.thm \
diff --git a/extras/Zip_gallwwwback.mk b/extras/Package_gallwwwback.mk
index 350727281e1a..c8424319ac06 100644
--- a/extras/Zip_gallwwwback.mk
+++ b/extras/Package_gallwwwback.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
+$(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
 
-$(eval $(call gb_Zip_add_files,gallwwwback,\
+$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallwwwback,share/gallery/www-back,\
 	aqua.jpg \
 	bathroom.jpg \
 	blocks.jpg \
diff --git a/extras/Zip_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk
index 488e1809466a..7285592b8eee 100644
--- a/extras/Zip_gallwwwgraf.mk
+++ b/extras/Package_gallwwwgraf.mk
@@ -7,9 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf))
+$(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf))
 
-$(eval $(call gb_Zip_add_files,gallwwwgraf,\
+$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallwwwgraf,share/gallery/www-graf,\
 	bluat.gif \
 	bluback.gif \
 	bludisk.gif \