From 2af5161658b61d75498b55a6f7bef653aeacaa14 Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Mon, 12 Sep 2011 07:03:29 +0000
Subject: [PATCH] Fix icons on win32

- Logo in help page remains broken because we haven't bundled svg
  libraries
---
 data/Makefile.am   | 6 ++----
 src/Makefile.am    | 2 +-
 src/resource.rc.in | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index 0584514..c782b17 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -10,9 +10,6 @@ dist_logo_DATA = logo.svg
 colordir = $(datadir)/aweather/colors/
 dist_color_DATA = colors/*.clr
 
-if WIN32
-noinst_DATA = icons/48x48/aweather.ico
-else
 desktopdir = $(datadir)/applications
 dist_desktop_DATA = aweather.desktop
 
@@ -29,11 +26,12 @@ dist_icon24_DATA = icons/24x24/aweather.png
 dist_icon32_DATA = icons/32x32/aweather.png
 dist_iconSC_DATA = icons/scalable/aweather.svg
 
+noinst_DATA = icons/48x48/aweather.ico
+
 install-data-hook:
 	if test -z "$(DESTDIR)"; then \
 		gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \
 	fi
-endif
 
 glade:
 	GLADE_CATALOG_PATH=. glade-3 main.ui.in
diff --git a/src/Makefile.am b/src/Makefile.am
index d3861eb..b0852f2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ aweather_dbg_CPPFLAGS = $(aweather_CPPFLAGS)
 aweather_dbg_LDADD    = $(aweather_LDADD)
 endif
 
-.rc.o: ../data/aweather.ico
+.rc.o: ../data/icons/48x48/aweather.ico
 	$(RC) -o $@ $<
 
 CLEANFILES = gmon.out valgrind.out
diff --git a/src/resource.rc.in b/src/resource.rc.in
index cf5da02..15d876e 100644
--- a/src/resource.rc.in
+++ b/src/resource.rc.in
@@ -30,4 +30,4 @@ VS_VERSION_INFO VERSIONINFO
     END
   END
 
-AWEATHER_ICON ICON "../data/aweather.ico"
+AWEATHER_ICON ICON "../data/icons/48x48/aweather.ico"
-- 
2.43.2