From 9abcbe45333fbcab67e8a0c324f4edc0757f11df Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Mon, 18 Dec 2006 15:59:51 +0000 Subject: [PATCH] Install the .ico icon file into $datadir/gnucash/pixmaps instead of $datadir/pixmaps. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15226 57a11ea4-9604-0410-9ed3-97b8803252fd --- packaging/win32/gnucash.iss.in | 4 ++-- src/pixmaps/Makefile.am | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packaging/win32/gnucash.iss.in b/packaging/win32/gnucash.iss.in index a9efac06e7..06df352f3b 100644 --- a/packaging/win32/gnucash.iss.in +++ b/packaging/win32/gnucash.iss.in @@ -36,9 +36,9 @@ Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm 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 diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am index c546a77471..b34310040c 100644 --- a/src/pixmaps/Makefile.am +++ b/src/pixmaps/Makefile.am @@ -28,15 +28,14 @@ gncpixmap_DATA = \ 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}