* Add .exe extension to tools on Windows

git-svn-id: trunk@24613 -

utils/fpcmkcfg/fpmake.pp

@@ -10,6 +10,7 @@ procedure add_fpcmkcfg;
 Var
   P : TPackage;
   T : TTarget;
+  Data2IncBin : string;
 
 begin
   With Installer do
@@ -31,11 +32,12 @@ begin
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-process');
 
-    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fpc.cft fpccfg.inc DefaultConfig','fpccfg.inc','fpc.cft');
-    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fpinc.cfg fpcfg.inc fpcfg','fpcfg.inc','fpinc.cfg');
-    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fpinc.ini fpini.inc fpini','fpini.inc','fpinc.ini');
-    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s fppkg.cfg fppkg.inc fppkg','fppkg.inc','fppkg.cfg');
-    p.Commands.AddCommand(caBeforeCompile,'data2inc','-b -s default.cft default.inc fppkg_default','default.inc','default.cft');
+    Data2IncBin := AddProgramExtension('data2inc',Defaults.BuildOS);
+    p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s fpc.cft fpccfg.inc DefaultConfig','fpccfg.inc','fpc.cft');
+    p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s fpinc.cfg fpcfg.inc fpcfg','fpcfg.inc','fpinc.cfg');
+    p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s fpinc.ini fpini.inc fpini','fpini.inc','fpinc.ini');
+    p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s fppkg.cfg fppkg.inc fppkg','fppkg.inc','fppkg.cfg');
+    p.Commands.AddCommand(caBeforeCompile, Data2IncBin, '-b -s default.cft default.inc fppkg_default','default.inc','default.cft');
 
     T:=P.Targets.AddProgram('fpcmkcfg.pp');
     T.ResourceStrings:=true;

utils/h2pas/fpmake.pp

@@ -30,8 +30,8 @@ begin
 
     P.Options.Add('-Sg');
 
-    p.Commands.AddCommand(caBeforeCompile,'pyacc','$(SOURCE) $(DEST)','h2pas.pas','h2pas.y');
-    p.Commands.AddCommand(caBeforeCompile,'plex','$(SOURCE) $(DEST)','scan.pas','scan.l');
+    p.Commands.AddCommand(caBeforeCompile, AddProgramExtension('pyacc', Defaults.BuildOS), '$(SOURCE) $(DEST)','h2pas.pas','h2pas.y');
+    p.Commands.AddCommand(caBeforeCompile, AddProgramExtension('plex', Defaults.BuildOS), '$(SOURCE) $(DEST)','scan.pas','scan.l');
 
     T:=P.Targets.AddProgram('h2pas.pas');
     T.Dependencies.AddUnit('h2poptions');