Merged revisions 4304 via svnmerge from

http://svn.freepascal.org/svn/fpc/trunk

........
  r4304 | florian | 2006-07-30 09:37:40 +0200 (So, 30 Jul 2006) | 2 lines
  
  * do default replacements for -o, fixes #7198
........

git-svn-id: branches/fixes_2_0@4305 -

compiler/options.pas

@@ -28,7 +28,7 @@ interface
 uses
   CClasses,globtype,globals,verbose,systems,cpuinfo;
 
-Type    
+Type
   TOption=class
     FirstPass,
     ParaLogo,
@@ -77,7 +77,7 @@ uses
 {$ENDIF USE_SYSUTILS}
   version,
   cutils,cmsgs,
-  comphook, 
+  comphook,
   symtable,scanner
 {$ifdef BrowserLog}
   ,browlog
@@ -874,15 +874,16 @@ begin
              begin
                if More<>'' then
                  begin
+                   DefaultReplacements(More);
 {$IFDEF USE_SYSUTILS}
-                 D:=SplitPath(More);
-                 OutputFile:=SplitFileName(More);
-                 OutputExtension:=SplitExtension(More);
+                   D:=SplitPath(More);
+                   OutputFile:=SplitFileName(More);
+                   OutputExtension:=SplitExtension(More);
 {$ELSE USE_SYSUTILS}
-                 FSplit(More,D,OutputFile,OutputExtension);
+                   FSplit(More,D,OutputFile,OutputExtension);
 {$ENDIF USE_SYSUTILS}
-                 if (D<>'') then
-                   OutputExeDir:=FixPath(D,True);
+                   if (D<>'') then
+                     OutputExeDir:=FixPath(D,True);
                  end
                else
                  IllegalPara(opt);
@@ -1198,7 +1199,7 @@ begin
                                  'A' : begin
                                         s:=Copy(more,3,length(More)-2);
                                         if not LinkLibraryAliases.AddDep(s) Then
-                                           IllegalPara(opt);                                       
+                                           IllegalPara(opt);
                                        end;
                                  'O' : begin
                                         s:=Copy(more,3,length(More)-2);
@@ -1209,7 +1210,7 @@ begin
                                 else
                                   IllegalPara(opt);
                                  end; {case}
-                                j:=length(more);    
+                                j:=length(more);
                               end; {else begin}
                           end;
                     'S' :