r16786 - gnucash/branches/2.2 - [r16678, r16683] #503889: Install icons according to spec.

[Andreas Köhler]

Author: andi5
Date: 2008-01-03 15:40:24 -0500 (Thu, 03 Jan 2008)
New Revision: 16786
Trac: http://svn.gnucash.org/trac/changeset/16786

Modified:
   gnucash/branches/2.2/packaging/win32/dist.sh
   gnucash/branches/2.2/src/pixmaps/Makefile.am
Log:
[r16678,r16683] #503889: Install icons according to spec.

On Win32, do not run the non-existant gtk-update-icon-cache and do not
distribute share\icons or share\pixmaps.


Modified: gnucash/branches/2.2/packaging/win32/dist.sh
===================================================================
--- gnucash/branches/2.2/packaging/win32/dist.sh	2008-01-03 20:04:11 UTC (rev 16785)
+++ gnucash/branches/2.2/packaging/win32/dist.sh	2008-01-03 20:40:24 UTC (rev 16786)
@@ -183,7 +183,7 @@
     cp -a $_INSTALL_UDIR/lib/gnucash/lib*.dll $DIST_UDIR/lib/gnucash
     cp -a $_INSTALL_UDIR/libexec $DIST_UDIR
     mkdir -p $DIST_UDIR/share
-    cp -a $_INSTALL_UDIR/share/{gnucash,locale,pixmaps,xml} $DIST_UDIR/share
+    cp -a $_INSTALL_UDIR/share/{gnucash,locale,xml} $DIST_UDIR/share
     cp -a $_REPOS_UDIR/packaging/win32/install-fq-mods.bat $DIST_UDIR/bin
 
     _QTDIR_WIN=`echo $QTDIR | sed 's,^/\([A-Za-z]\)/,\1:/,g' `

Modified: gnucash/branches/2.2/src/pixmaps/Makefile.am
===================================================================
--- gnucash/branches/2.2/src/pixmaps/Makefile.am	2008-01-03 20:04:11 UTC (rev 16785)
+++ gnucash/branches/2.2/src/pixmaps/Makefile.am	2008-01-03 20:40:24 UTC (rev 16786)
@@ -36,10 +36,48 @@
   stock_split_title.png \
   stock_split_watermark.png
 
-gncicondir = ${datadir}/pixmaps
-gncicon_DATA = gnucash-icon-16x16.png \
-  gnucash-icon-32x32.png \
-  gnucash-icon-48x48.png
+gncnormalicondir = ${datadir}/icons/hicolor/48x48/apps
+gncnormalicon_DATA = 48x48/gnucash-icon.png
+48x48/gnucash-icon.png: gnucash-icon-48x48.png
+	-mkdir -p 48x48
+	cp ${srcdir}/gnucash-icon-48x48.png 48x48/gnucash-icon.png
 
+gncmediumicondir = ${datadir}/icons/hicolor/32x32/apps
+gncmediumicon_DATA = 32x32/gnucash-icon.png
+32x32/gnucash-icon.png: gnucash-icon-32x32.png
+	-mkdir -p 32x32
+	cp ${srcdir}/gnucash-icon-32x32.png 32x32/gnucash-icon.png
+
+gncsmallicondir = ${datadir}/icons/hicolor/16x16/apps
+gncsmallicon_DATA = 16x16/gnucash-icon.png
+16x16/gnucash-icon.png: gnucash-icon-16x16.png
+	-mkdir -p 16x16
+	cp ${srcdir}/gnucash-icon-16x16.png 16x16/gnucash-icon.png
+
+gncscalableicondir = ${datadir}/icons/hicolor/scalable/apps
+gncscalableicon_DATA = scalable/gnucash-icon.svg
+scalable/gnucash-icon.svg: ${top_srcdir}/art/icon.svgz
+	-mkdir -p scalable
+	gzip -cd ${top_srcdir}/art/icon.svgz > scalable/gnucash-icon.svg
+
+# As suggested by <http://live.gnome.org/GnomeGoals/AppIcon>
+if !OS_WIN32
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		$(gtk_update_icon_cache); \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		echo "***   $(gtk_update_icon_cache)"; \
+	fi
+endif
+
 EXTRA_DIST = \
-  ${gncpixmap_DATA} ${gncicon_DATA}
+  ${gncpixmap_DATA} \
+  ${gncnormalicon_DATA} ${gncmediumicon_DATA} ${gncsmallicon_DATA} ${gncscalableicon_DATA}
+
+clean-local:
+	-rm -rf 48x48 32x32 16x16 scalable