X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=data%2FMakefile.am;fp=data%2FMakefile.am;h=f6447507eca6260864509df364f4adb6c36fa64a;hp=ad651d1e92601c1db3600bf63a95a59989f8d332;hb=5d02e9824afbc67d431e3d3e59797425f91cddcd;hpb=837893b3f6021439f30c7e7147166648d149ca34

diff --git a/data/Makefile.am b/data/Makefile.am
index ad651d1..f644750 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,24 +4,38 @@ dist_gtkbuilder_DATA = main.ui
 configdir = $(datadir)/aweather/
 dist_config_DATA = defaults.ini
 
+logodir = $(datadir)/aweather/
+logo_DATA = logo.svg
+
 colordir = $(datadir)/aweather/colors/
 dist_color_DATA = colors/*.clr
 
 if WIN32
-noinst_DATA = aweather.ico
+noinst_DATA = icons/48x48/aweather.ico
 else
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = aweather.desktop
 
-pixmapdir = $(datadir)/pixmaps
-dist_pixmap_DATA = aweather.png
+icon16dir = $(datadir)/icons/hicolor/16x16/apps/
+icon22dir = $(datadir)/icons/hicolor/22x22/apps/
+icon24dir = $(datadir)/icons/hicolor/24x24/apps/
+icon32dir = $(datadir)/icons/hicolor/32x32/apps/
+icon48dir = $(datadir)/icons/hicolor/48x48/apps/
+iconSCdir = $(datadir)/icons/hicolor/scalable/apps
+
+icon16_DATA = icons/16x16/aweather.png
+icon22_DATA = icons/22x22/aweather.png
+icon24_DATA = icons/24x24/aweather.png
+icon32_DATA = icons/32x32/aweather.png
+iconSC_DATA = icons/scalable/aweather.svg
+
+install-data-hook:
+	gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 endif
 
 glade:
 	GLADE_CATALOG_PATH=. glade-3 main.ui.in
 
-.svg.png:
-	rsvg -w 48 -h 48 $< $@
 .png.ico:
 	icotool -c $< -o $@