[fpc-devel] FPC ide installation issue - fpmake.pp

[Sandro Cumerlato]

Operating System: Windows 7
Affected FPC svn revision: 26202

IDE is not properly installed into bin directory (bin\i386-win32 in my
case), listed below files are resetted in place instead:

ide\cvsco.tdf
ide\cvsdiff.tdf
ide\cvsup.tdf
ide\fp.ans
ide\fp32.ico
ide\gplprog.pt
ide\gplunit.pt
ide\grep.tdf
ide\program.pt
ide\tpgrep.tdf
ide\unit.pt

Attached patch solves this problem under Windows. Please test under other
Operating Systems and apply to trunk if ok.

Best regards.

Sandro Cumerlato
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freepascal.org/pipermail/fpc-devel/attachments/20131209/76a547a6/attachment.html>
-------------- next part --------------
Index: ide/fpmake.pp
===================================================================
--- ide/fpmake.pp	(revisione 26202)
+++ ide/fpmake.pp	(copia locale)
@@ -188,17 +188,17 @@
     T.Directory:='compiler';
     T.Install:=false;
 
-    P.InstallFiles.Add('fp.ans','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('gplprog.pt','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('gplunit.pt','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('program.pt','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('unit.pt','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('cvsco.tdf','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('cvsdiff.tdf','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('cvsup.tdf','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('grep.tdf','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('tpgrep.tdf','$(BASEINSTALLDIR)ide');
-    P.InstallFiles.Add('fp32.ico', [win32, win64], '$(BASEINSTALLDIR)ide');
+    P.InstallFiles.Add('fp.ans','$(BININSTALLDIR)');
+    P.InstallFiles.Add('gplprog.pt','$(BININSTALLDIR)');
+    P.InstallFiles.Add('gplunit.pt','$(BININSTALLDIR)');
+    P.InstallFiles.Add('program.pt','$(BININSTALLDIR)');
+    P.InstallFiles.Add('unit.pt','$(BININSTALLDIR)');
+    P.InstallFiles.Add('cvsco.tdf','$(BININSTALLDIR)');
+    P.InstallFiles.Add('cvsdiff.tdf','$(BININSTALLDIR)');
+    P.InstallFiles.Add('cvsup.tdf','$(BININSTALLDIR)');
+    P.InstallFiles.Add('grep.tdf','$(BININSTALLDIR)');
+    P.InstallFiles.Add('tpgrep.tdf','$(BININSTALLDIR)');
+    P.InstallFiles.Add('fp32.ico', [win32, win64], '$(BININSTALLDIR)');
 
     P.Sources.AddDoc('readme.ide');