Remove duplication of mime type icons in final packages

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> (cherry picked from commit 7b1350b7d3)
4 weeks ago · ae6ac9ec80
parent 07235992f8
commit ae6ac9ec80
33 changed files with 9 additions and 5 deletions
--- a/configure.in
+++ b/configure.in
@ -188,6 +188,8 @@ AC_CONFIG_FILES([ doc/et/Makefile ])
 AC_CONFIG_FILES([ doc/pt/Makefile ])
 AC_CONFIG_FILES([ doc/sv/Makefile ])
 AC_CONFIG_FILES([ icons/Makefile ])
 AC_CONFIG_FILES([ icons/actions/Makefile ])
 AC_CONFIG_FILES([ icons/mime/Makefile ])
 AC_CONFIG_FILES([ layouts/Makefile ])
 AC_CONFIG_FILES([ src/Makefile ])
 AC_CONFIG_FILES([ src/backends/Makefile ])
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@ -1,5 +1 @@
-krecipesdir   = $(kde_datadir)/krecipes/icons
+SUBDIRS = actions mime
 krecipes_ICON = AUTO
 KDE_ICON = krecipes_file
--- a/icons/actions/Makefile.am
+++ b/icons/actions/Makefile.am
@ -0,0 +1,3 @@
 krecipesdir   = $(kde_datadir)/krecipes/icons
 krecipes_ICON = AUTO
--- a/icons/actions/cr16-action-categories.png
+++ b/icons/actions/cr16-action-categories.png
--- a/icons/actions/cr16-action-diet.png
+++ b/icons/actions/cr16-action-diet.png
--- a/icons/actions/cr16-action-ingredients.png
+++ b/icons/actions/cr16-action-ingredients.png
--- a/icons/actions/cr16-action-properties.png
+++ b/icons/actions/cr16-action-properties.png
--- a/icons/actions/cr16-action-trolley.png
+++ b/icons/actions/cr16-action-trolley.png
--- a/icons/actions/cr16-action-units.png
+++ b/icons/actions/cr16-action-units.png
--- a/icons/actions/cr22-action-categories.png
+++ b/icons/actions/cr22-action-categories.png
--- a/icons/actions/cr22-action-diet.png
+++ b/icons/actions/cr22-action-diet.png
--- a/icons/actions/cr22-action-ingredients.png
+++ b/icons/actions/cr22-action-ingredients.png
--- a/icons/actions/cr22-action-properties.png
+++ b/icons/actions/cr22-action-properties.png
--- a/icons/actions/cr22-action-trolley.png
+++ b/icons/actions/cr22-action-trolley.png
--- a/icons/actions/cr22-action-units.png
+++ b/icons/actions/cr22-action-units.png
--- a/icons/actions/cr32-action-categories.png
+++ b/icons/actions/cr32-action-categories.png
--- a/icons/actions/cr32-action-diet.png
+++ b/icons/actions/cr32-action-diet.png
--- a/icons/actions/cr32-action-ingredients.png
+++ b/icons/actions/cr32-action-ingredients.png
--- a/icons/actions/cr32-action-krectip.png
+++ b/icons/actions/cr32-action-krectip.png
--- a/icons/actions/cr32-action-properties.png
+++ b/icons/actions/cr32-action-properties.png
--- a/icons/actions/cr32-action-trolley.png
+++ b/icons/actions/cr32-action-trolley.png
--- a/icons/actions/cr32-action-units.png
+++ b/icons/actions/cr32-action-units.png
--- a/icons/actions/cr48-action-categories.png
+++ b/icons/actions/cr48-action-categories.png
--- a/icons/actions/cr48-action-diet.png
+++ b/icons/actions/cr48-action-diet.png
--- a/icons/actions/cr48-action-ingredients.png
+++ b/icons/actions/cr48-action-ingredients.png
--- a/icons/actions/cr48-action-properties.png
+++ b/icons/actions/cr48-action-properties.png
--- a/icons/actions/cr48-action-trolley.png
+++ b/icons/actions/cr48-action-trolley.png
--- a/icons/actions/cr48-action-units.png
+++ b/icons/actions/cr48-action-units.png
--- a/icons/mime/Makefile.am
+++ b/icons/mime/Makefile.am
@ -0,0 +1,3 @@
 krecipesdir   = $(datadir)/icons
 krecipes_ICON = AUTO
--- a/icons/mime/cr128-mime-krecipes_file.png
+++ b/icons/mime/cr128-mime-krecipes_file.png
--- a/icons/mime/cr16-mime-krecipes_file.png
+++ b/icons/mime/cr16-mime-krecipes_file.png
--- a/icons/mime/cr32-mime-krecipes_file.png
+++ b/icons/mime/cr32-mime-krecipes_file.png
--- a/icons/mime/cr64-mime-krecipes_file.png
+++ b/icons/mime/cr64-mime-krecipes_file.png
		`@ -0,0 +1,3 @@`
							`krecipesdir = $(kde_datadir)/krecipes/icons`
							`krecipes_ICON = AUTO`
		`@ -0,0 +1,3 @@`
							`krecipesdir = $(datadir)/icons`
							`krecipes_ICON = AUTO`