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

diff --git a/data/Makefile.am b/data/Makefile.am
index f644750..a778609 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,15 +4,15 @@ dist_gtkbuilder_DATA = main.ui
 configdir = $(datadir)/aweather/
 dist_config_DATA = defaults.ini
 
+fipsdir = $(datadir)/aweather/
+dist_fips_DATA = fips.txt
+
 logodir = $(datadir)/aweather/
-logo_DATA = logo.svg
+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
 
@@ -23,15 +23,22 @@ 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
+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://lug.rose-hulman.edu/proj/aweather/files/fips/fips.txt
 
 install-data-hook:
-	gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-endif
+	if test -z "$(DESTDIR)"; then \
+		gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \
+	fi
 
 glade:
 	GLADE_CATALOG_PATH=. glade-3 main.ui.in