--- imach/src/setup.iss.in	2006/01/27 20:19:13	1.6
+++ imach/src/setup.iss.in	2014/09/15 20:57:31	1.11
@@ -1,12 +1,29 @@
 ; -- IMaCh.iss --
-; $Id: setup.iss.in,v 1.6 2006/01/27 20:19:13 brouard Exp $
+; $Id: setup.iss.in,v 1.11 2014/09/15 20:57:31 brouard Exp $
 ;  $State: Exp $
 ;  $Log: setup.iss.in,v $
-;  Revision 1.6  2006/01/27 20:19:13  brouard
-;  noreg added
+;  Revision 1.11  2014/09/15 20:57:31  brouard
+;  *** empty log message ***
 ;
-;  Revision 1.5  2005/09/30 18:02:25  lievre
-;  unix2dos added
+;  Revision 1.10  2009/10/29 13:20:46  brouard
+;  0.98l
+;
+;  Revision 1.9  2006/02/09 20:10:37  lievre
+;  (Module): IMACHSETUPVERSION added
+;
+;  Revision 1.8  2006/02/09 15:21:55  lievre
+;  * setup.iss.in (Module): IMACHSETUPVERSION added
+;
+;  * noreg-setup.iss (Module): added to cvs tree
+;
+;  Revision 1.7  2006/02/09 14:29:39  lievre
+;  (Module): IMACHSETUPVERSION added
+;
+;  Revision 1.6  2006/01/27 20:19:13  brouard
+;  noreg added
+;
+;  Revision 1.5  2005/09/30 18:02:25  lievre
+;  unix2dos added
 ;
 ;  Revision 1.4  2005/09/30 17:39:58  lievre
 ;  The files mypar.txt and data1.txt added
@@ -23,9 +40,9 @@
 AppName=@APPNAME@
 AppVerName=@APPNAME@ Version @VERSION@
 AppCopyright=@COPYRIGHT@
-DefaultDirName={pf}\IMaCh
+DefaultDirName={pf}\@APPNAME@
 DefaultGroupName=IMaCh
-OutputBaseFilename=imach-@VERSION@-@NOREG@setup
+OutputBaseFilename=imach-@VERSION@-@IMACHSETUPVERSION@-@NOREG@setup
 UninstallDisplayIcon={app}\imach.exe
 InfoBeforeFile=@INFOBEFOREFILE@
 ;;SetupIconFile={app}\imach.exe
@@ -40,13 +57,14 @@ Source: imach.exe; DestDir: {app}\bin
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc
 Source: README.txt; DestDir: {app}; Flags: isreadme
 Source: imach.ico; DestDir: {app}\bin
-Source: gnuplot.exe; DestDir: {app}\bin
-Source: wgnuplot.hlp; DestDir: {app}\bin
+;;Source: gnuplot.exe; DestDir: {app}\bin
+Source: gnuplot_bin\windows-265\bin\*; DestDir: {app}\bin
+;;Source: wgnuplot.hlp; DestDir: {app}\bin
 Source: website.url; DestDir: {app}
 
 ;; win95
 ;;Source: ModifyAutoexec.exe; DestDir: {tmp}
-Source: wgnuplot.mnu; DestDir: {app}\bin
+;;Source: wgnuplot.mnu; DestDir: {app}\bin
 Source: ..\html\doc\imach.htm; DestDir: {app}\doc
 Source: ..\html\doc\biaspar.gp; DestDir: {app}\doc
 Source: ..\html\doc\biaspar.htm; DestDir: {app}\doc
@@ -86,7 +104,7 @@ Source: ..\html\doc\biaspar\varpijgrbias
 Source: ..\html\doc\biaspar\varpijgrbiaspar123-13.png; DestDir: {app}\doc\biaspar\
 Source: ..\html\doc\biaspar\varpijgrbiaspar123-21.png; DestDir: {app}\doc\biaspar\
 Source: ..\html\doc\biaspar\varmuptjgr-stablbased-biaspar1.png; DestDir: {app}\doc\biaspar\
-Source: ..\html\doc\mydata.txt; DestDir: {app}\doc
+Source: ..\html\doc\data\mydata.txt; DestDir: {app}\doc\data
 Source: ..\html\doc\mypar.imach; DestDir: {app}\doc
 Source: ..\html\doc\data1.txt; DestDir: {app}\doc
 ;;Then add a [Run] section entry, telling Setup to execute the EXE after all other installation steps: