r15226 - gnucash/trunk - Install the .ico icon file into $datadir/gnucash/pixmaps instead of $datadir/pixmaps.

[Christian Stimming]

Author: cstim
Date: 2006-12-18 10:59:51 -0500 (Mon, 18 Dec 2006)
New Revision: 15226
Trac: http://svn.gnucash.org/trac/changeset/15226

Modified:
   gnucash/trunk/packaging/win32/gnucash.iss.in
   gnucash/trunk/src/pixmaps/Makefile.am
Log:
Install the .ico icon file into $datadir/gnucash/pixmaps instead of $datadir/pixmaps.

Modified: gnucash/trunk/packaging/win32/gnucash.iss.in
===================================================================
--- gnucash/trunk/packaging/win32/gnucash.iss.in	2006-12-18 15:35:59 UTC (rev 15225)
+++ gnucash/trunk/packaging/win32/gnucash.iss.in	2006-12-18 15:59:51 UTC (rev 15226)
@@ -36,9 +36,9 @@
 Name: menuicon; Description: "{cm:CreateMenuLink}"; GroupDescription: "{cm:AdditionalIcons}"
 
 [Icons]
-Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\pixmaps\gnucash-icon.ico"; Tasks: menuicon
+Name: "{group}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: menuicon
 Name: "{group}\Uninstall GnuCash"; Filename: "{uninstallexe}"; Tasks: menuicon
-Name: "{userdesktop}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
+Name: "{userdesktop}\GnuCash"; Filename: "{app}\bin\gnucash.bat"; WorkingDir: "{app}\bin"; Comment: "GnuCash Free Finance Manager"; IconFilename: "{app}\share\gnucash\pixmaps\gnucash-icon.ico"; Tasks: desktopicon
 
 [Run]
 Filename: "{app}\bin\gnucash.bat"; Description: "{cm:RunPrg}"; WorkingDir: "{app}\bin"; Flags: postinstall skipifsilent

Modified: gnucash/trunk/src/pixmaps/Makefile.am
===================================================================
--- gnucash/trunk/src/pixmaps/Makefile.am	2006-12-18 15:35:59 UTC (rev 15225)
+++ gnucash/trunk/src/pixmaps/Makefile.am	2006-12-18 15:59:51 UTC (rev 15226)
@@ -28,15 +28,14 @@
   gnc-sx-new.png \
   gnc-transfer-16.png \
   gnc-transfer.png \
+  gnucash-icon.ico \
   gnucash-icon.png \
   gnucash_splash.png \
   stock_split_title.png \
   stock_split_watermark.png
 
 gncicondir = ${datadir}/pixmaps
-gncicon_DATA = \
-  gnucash-icon.ico \
-  gnucash-icon.png
+gncicon_DATA = gnucash-icon.png
 
 EXTRA_DIST = \
   ${gncpixmap_DATA} ${gncicon_DATA}