X-Git-Url: http://pileus.org/git/?p=aweather;a=blobdiff_plain;f=data%2FMakefile.am;h=842b763856bf4a633347d5495fa6de421cc5617e;hp=ba5e93e46871f584e942f0179ed4785a933d9684;hb=9e734911e96ae83b0f41afa5073d5313bc197d96;hpb=0710ad564f97bf0e8aa3460fcb79110623d46544

diff --git a/data/Makefile.am b/data/Makefile.am
index ba5e93e..842b763 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,24 +4,48 @@ dist_gtkbuilder_DATA = main.ui
 configdir = $(datadir)/aweather/
 dist_config_DATA = defaults.ini
 
+fipsdir = $(datadir)/aweather/
+dist_fips_DATA = fips.txt
+
+logodir = $(datadir)/aweather/
+dist_logo_DATA = logo.svg
+
+icondir = $(datadir)/aweather/
+dist_icon_DATA = car.png arrow.png
+
 colordir = $(datadir)/aweather/colors/
-dist_color_DATA = colors/*
+dist_color_DATA = colors/*.clr
 
-if WIN32
-noinst_DATA = aweather.ico
-else
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = aweather.desktop
 
-pixmapdir = $(datadir)/pixmaps
-dist_pixmap_DATA = aweather.png
-endif
+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
+
+dist_icon16_DATA = icons/16x16/aweather.png
+dist_icon22_DATA = icons/22x22/aweather.png
+dist_icon24_DATA = icons/24x24/aweather.png
+dist_icon32_DATA = icons/32x32/aweather.png
+dist_icon48_DATA = icons/48x48/aweather.png
+dist_iconSC_DATA = icons/scalable/aweather.svg
+
+dist_noinst_DATA = icons/48x48/aweather.ico
+
+fips.txt:
+	wget http://pileus.org/aweather/files/fips/fips.txt
+
+install-data-hook:
+	if test -z "$(DESTDIR)"; then \
+		gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \
+	fi
 
 glade:
 	GLADE_CATALOG_PATH=. glade-3 main.ui.in
 
-.svg.png:
-	rsvg -w 48 -h 48 $< $@
 .png.ico:
 	icotool -c $< -o $@