diff --git a/compiler/fppu.pas b/compiler/fppu.pas
index 309c54b0f6..2301e3ec33 100644
--- a/compiler/fppu.pas
+++ b/compiler/fppu.pas
@@ -267,16 +267,16 @@ uses
            do_compile:=true;
            recompile_reason:=rr_noppu;
          {Check for .pp file}
-           Found:=UnitExists(target_info.sourceext,hs);
+           Found:=UnitExists(sourceext,hs);
            if not Found then
             begin
               { Check for .pas }
-              Found:=UnitExists(target_info.pasext,hs);
+              Found:=UnitExists(pasext,hs);
             end;
            if not Found and (m_mac in aktmodeswitches) then
             begin
               { Check for .p, if mode is macpas}
-              Found:=UnitExists('.p',hs);
+              Found:=UnitExists(pext,hs);
             end;
            stringdispose(mainsource);
            if Found then
@@ -348,17 +348,17 @@ uses
           begin
             { the full filename is specified so we can't use here the
               searchpath (PFV) }
-            Message1(unit_t_unitsearch,AddExtension(sourcefn^,target_info.sourceext));
-            fnd:=FindFile(AddExtension(sourcefn^,target_info.sourceext),'',hs);
+            Message1(unit_t_unitsearch,AddExtension(sourcefn^,sourceext));
+            fnd:=FindFile(AddExtension(sourcefn^,sourceext),'',hs);
             if not fnd then
              begin
-               Message1(unit_t_unitsearch,AddExtension(sourcefn^,target_info.pasext));
-               fnd:=FindFile(AddExtension(sourcefn^,target_info.pasext),'',hs);
+               Message1(unit_t_unitsearch,AddExtension(sourcefn^,pasext));
+               fnd:=FindFile(AddExtension(sourcefn^,pasext),'',hs);
              end;
-            if not fnd and (m_mac in aktmodeswitches) then
+            if not fnd and ((m_mac in aktmodeswitches) or target_info.p_ext_support) then
              begin
-               Message1(unit_t_unitsearch,AddExtension(sourcefn^,'.p'));
-               fnd:=FindFile(AddExtension(sourcefn^,'.p'),'',hs);
+               Message1(unit_t_unitsearch,AddExtension(sourcefn^,pext));
+               fnd:=FindFile(AddExtension(sourcefn^,pext),'',hs);
              end;
             if fnd then
              begin
@@ -1611,7 +1611,11 @@ uses
 end.
 {
   $Log$
-  Revision 1.67  2005-02-14 17:13:06  peter
+  Revision 1.68  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.67  2005/02/14 17:13:06  peter
     * truncate log
 
   Revision 1.66  2005/01/19 22:19:41  peter
diff --git a/compiler/globals.pas b/compiler/globals.pas
index 38e247faf2..b1360298b6 100644
--- a/compiler/globals.pas
+++ b/compiler/globals.pas
@@ -76,6 +76,11 @@ interface
        { maximum nesting of routines }
        maxnesting = 32;
 
+       { Filenames and extensions }
+       sourceext  = '.pp';
+       pasext     = '.pas';
+       pext       = '.p';
+
        treelogfilename = 'tree.log';
 
 {$if defined(CPUARM) and defined(FPUFPA)}
@@ -2289,7 +2294,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.173  2005-03-13 11:27:52  florian
+  Revision 1.174  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.173  2005/03/13 11:27:52  florian
     + gpc mode uses tp_procvars
 
   Revision 1.172  2005/02/14 17:13:06  peter
diff --git a/compiler/options.pas b/compiler/options.pas
index 588b88b886..8a47b61c64 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -1959,12 +1959,13 @@ begin
 {$ENDIF USE_SYSUTILS}
   if inputextension='' then
    begin
-     if FileExists(inputdir+inputfile+target_info.sourceext) then
-      inputextension:=target_info.sourceext
-     else if FileExists(inputdir+inputfile+target_info.pasext) then
-       inputextension:=target_info.pasext
-     else if (m_mac in aktmodeswitches) and FileExists(inputdir+inputfile+'.p') then
-       inputextension:='.p';
+     if FileExists(inputdir+inputfile+sourceext) then
+      inputextension:=sourceext
+     else if FileExists(inputdir+inputfile+pasext) then
+       inputextension:=pasext
+     else if ((m_mac in aktmodeswitches) or target_info.p_ext_support) 
+	     and FileExists(inputdir+inputfile+pext) then
+       inputextension:=pext;
    end;
 
   { Check output dir }
@@ -2103,7 +2104,11 @@ finalization
 end.
 {
   $Log$
-  Revision 1.170  2005-03-05 16:37:42  florian
+  Revision 1.171  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.170  2005/03/05 16:37:42  florian
     * fixed copy(dyn. array,...);
 
   Revision 1.169  2005/03/04 16:49:22  peter
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index 84f84c5711..84fc02708e 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -1132,9 +1132,9 @@ implementation
               if (not found) then
                found:=findincludefile(path,name,'.inc',foundfile);
               if (not found) then
-               found:=findincludefile(path,name,target_info.sourceext,foundfile);
+               found:=findincludefile(path,name,sourceext,foundfile);
               if (not found) then
-               found:=findincludefile(path,name,target_info.pasext,foundfile);
+               found:=findincludefile(path,name,pasext,foundfile);
             end;
            if current_scanner.inputfilecount<max_include_nesting then
              begin
@@ -3348,7 +3348,11 @@ exit_label:
 end.
 {
   $Log$
-  Revision 1.102  2005-03-20 18:13:34  olle
+  Revision 1.103  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.102  2005/03/20 18:13:34  olle
     * Support for pascal constant expr in compile time expr, is now only allowed in mode Delphi
     + Warning for undefined compile time var in mode macpas
     * Support for some turbo directives in mode macpas
diff --git a/compiler/systems.pas b/compiler/systems.pas
index b48646606e..5e620138de 100644
--- a/compiler/systems.pas
+++ b/compiler/systems.pas
@@ -243,9 +243,7 @@ interface
           flags        : set of tsystemflags;
           cpu          : tsystemcpu;
           unit_env     : string[16];
-          extradefines : string[40];
-          sourceext,
-          pasext,
+          extradefines : string[40]; 
           exeext,
           defext,
           scriptext,
@@ -264,6 +262,7 @@ interface
           staticClibext,
           staticClibprefix : string[4];
           sharedClibprefix : string[4];
+          p_ext_support:Boolean; {Whether extension .p is supported by default}
           Cprefix      : string[2];
           newline      : string[2];
           dirsep       : char;
@@ -718,7 +717,11 @@ finalization
 end.
 {
   $Log$
-  Revision 1.103  2005-02-14 17:13:09  peter
+  Revision 1.104  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.103  2005/02/14 17:13:09  peter
     * truncate log
 
   Revision 1.102  2005/02/13 20:11:16  peter
diff --git a/compiler/systems/i_amiga.pas b/compiler/systems/i_amiga.pas
index f73c362767..e47408750b 100644
--- a/compiler/systems/i_amiga.pas
+++ b/compiler/systems/i_amiga.pas
@@ -37,8 +37,6 @@ unit i_amiga;
             cpu          : cpu_m68k;
             unit_env     : '';
             extradefines : '';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -57,6 +55,7 @@ unit i_amiga;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -168,7 +167,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.8  2005-02-14 17:13:10  peter
+  Revision 1.9  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.8  2005/02/14 17:13:10  peter
     * truncate log
 
   Revision 1.7  2005/02/03 03:54:06  karoly
diff --git a/compiler/systems/i_atari.pas b/compiler/systems/i_atari.pas
index 7ee09f69c1..0dfac2f007 100644
--- a/compiler/systems/i_atari.pas
+++ b/compiler/systems/i_atari.pas
@@ -40,8 +40,6 @@ unit i_atari;
             extradefines : '';
             sharedlibext : '.dll';
             staticlibext : '.a';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '.tpp';
             defext       : '';
             scriptext    : '';
@@ -54,6 +52,7 @@ unit i_atari;
             resobjext    : '.or';
             staticlibprefix : '';
             sharedlibprefix : '';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
@@ -84,7 +83,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.6  2005-02-14 17:13:10  peter
+  Revision 1.7  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.6  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_beos.pas b/compiler/systems/i_beos.pas
index c50587f8a4..5179059bbd 100644
--- a/compiler/systems/i_beos.pas
+++ b/compiler/systems/i_beos.pas
@@ -37,8 +37,6 @@ unit i_beos;
             cpu          : cpu_i386;
             unit_env     : 'BEOSUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -57,6 +55,7 @@ unit i_beos;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -101,7 +100,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.7  2005-02-14 17:13:10  peter
+  Revision 1.8  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.7  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_bsd.pas b/compiler/systems/i_bsd.pas
index acfbb471ef..5b8cd59f71 100644
--- a/compiler/systems/i_bsd.pas
+++ b/compiler/systems/i_bsd.pas
@@ -40,8 +40,6 @@ unit i_bsd;
             cpu          : cpu_i386;
             unit_env     : 'BSDUNITS';
             extradefines : 'UNIX;BSD;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -60,6 +58,7 @@ unit i_bsd;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -103,8 +102,6 @@ unit i_bsd;
             cpu          : cpu_x86_64;
             unit_env     : 'BSDUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -123,6 +120,7 @@ unit i_bsd;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -166,8 +164,6 @@ unit i_bsd;
             cpu          : cpu_i386;
             unit_env     : 'BSDUNITS';
             extradefines : 'UNIX;BSD;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -186,6 +182,7 @@ unit i_bsd;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
@@ -228,8 +225,6 @@ unit i_bsd;
             cpu          : cpu_i386;
             unit_env     : 'BSDUNITS';
             extradefines : 'UNIX;BSD;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -248,6 +243,7 @@ unit i_bsd;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
@@ -290,8 +286,6 @@ unit i_bsd;
             cpu          : cpu_m68k;
             unit_env     : 'BSDUNITS';
             extradefines : 'UNIX;BSD;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -310,6 +304,7 @@ unit i_bsd;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -352,8 +347,6 @@ unit i_bsd;
             cpu          : cpu_powerpc;
             unit_env     : '';
             extradefines : 'UNIX;BSD;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -372,6 +365,7 @@ unit i_bsd;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -417,8 +411,6 @@ unit i_bsd;
             cpu          : cpu_powerpc;
             unit_env     : 'BSDUNITS';
             extradefines : 'UNIX;BSD;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -437,6 +429,7 @@ unit i_bsd;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : true;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
@@ -506,7 +499,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.16  2005-02-14 17:13:10  peter
+  Revision 1.17  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.16  2005/02/14 17:13:10  peter
     * truncate log
 
   Revision 1.15  2005/01/25 18:48:15  peter
diff --git a/compiler/systems/i_emx.pas b/compiler/systems/i_emx.pas
index 39ec104511..28bf4df9c3 100644
--- a/compiler/systems/i_emx.pas
+++ b/compiler/systems/i_emx.pas
@@ -45,8 +45,6 @@ unit i_emx;
             cpu          : cpu_i386;
             unit_env     : 'EMXUNITS';
             extradefines : 'OS2';
-            sourceext    : '.pas';
-            pasext       : '.pp';
             exeext       : '.exe';
             defext       : '.def';
             scriptext    : '.cmd';
@@ -65,6 +63,7 @@ unit i_emx;
             staticClibext : '.a';
             staticClibprefix : '';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #13#10;
             dirsep       : '\';
@@ -115,7 +114,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.7  2005-02-14 17:13:10  peter
+  Revision 1.8  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.7  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_go32v2.pas b/compiler/systems/i_go32v2.pas
index 5da4b5a67d..0f71bac504 100644
--- a/compiler/systems/i_go32v2.pas
+++ b/compiler/systems/i_go32v2.pas
@@ -37,8 +37,6 @@ unit i_go32v2;
             cpu          : cpu_i386;
             unit_env     : 'GO32V2UNITS';
             extradefines : 'DPMI';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '.exe';
             defext       : '.def';
             scriptext    : '.bat';
@@ -57,6 +55,7 @@ unit i_go32v2;
             staticClibext : '.a';
             staticClibprefix : '';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #13#10;
             dirsep       : '\';
@@ -101,7 +100,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.6  2005-02-14 17:13:10  peter
+  Revision 1.7  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.6  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_linux.pas b/compiler/systems/i_linux.pas
index 24ad77179e..c9ca4672ea 100644
--- a/compiler/systems/i_linux.pas
+++ b/compiler/systems/i_linux.pas
@@ -37,8 +37,6 @@ unit i_linux;
             cpu          : cpu_i386;
             unit_env     : 'LINUXUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -57,6 +55,7 @@ unit i_linux;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -100,8 +99,6 @@ unit i_linux;
             cpu          : cpu_m68k;
             unit_env     : 'LINUXUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '';
             scriptext    : '.sh';
@@ -120,6 +117,7 @@ unit i_linux;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -163,8 +161,6 @@ unit i_linux;
             cpu          : cpu_powerpc;
             unit_env     : '';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -183,6 +179,7 @@ unit i_linux;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -226,8 +223,6 @@ unit i_linux;
             cpu          : cpu_alpha;
             unit_env     : 'LINUXUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -246,6 +241,7 @@ unit i_linux;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -290,8 +286,6 @@ unit i_linux;
             cpu          : cpu_x86_64;
             unit_env     : 'LINUXUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -310,6 +304,7 @@ unit i_linux;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -353,8 +348,6 @@ unit i_linux;
             cpu          : cpu_SPARC;
             unit_env     : 'LINUXUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -373,6 +366,7 @@ unit i_linux;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -416,8 +410,6 @@ unit i_linux;
             cpu          : cpu_arm;
             unit_env     : 'LINUXUNITS';
             extradefines : 'UNIX;HASUNIX';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -436,6 +428,7 @@ unit i_linux;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -514,7 +507,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.36  2005-02-14 17:13:10  peter
+  Revision 1.37  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.36  2005/02/14 17:13:10  peter
     * truncate log
 
   Revision 1.35  2005/02/06 00:05:56  florian
diff --git a/compiler/systems/i_macos.pas b/compiler/systems/i_macos.pas
index 7b99b2ad65..c58cd1e647 100644
--- a/compiler/systems/i_macos.pas
+++ b/compiler/systems/i_macos.pas
@@ -36,8 +36,6 @@ unit i_macos;
             cpu          : cpu_powerpc;
             unit_env     : '';
             extradefines : '';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '';
             scriptext    : '';
@@ -56,6 +54,7 @@ unit i_macos;
             staticClibext : 'Lib';
             staticClibprefix : '';
             sharedClibprefix : '';
+            p_ext_support : true;
             Cprefix      : '';
             newline      : #13;
             dirsep       : ':';
@@ -101,7 +100,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.19  2005-02-14 17:13:10  peter
+  Revision 1.20  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.19  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_morph.pas b/compiler/systems/i_morph.pas
index b388c6c51d..1b7a2593d2 100644
--- a/compiler/systems/i_morph.pas
+++ b/compiler/systems/i_morph.pas
@@ -37,8 +37,6 @@ unit i_morph;
             cpu          : cpu_powerpc;
             unit_env     : '';
             extradefines : '';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -57,6 +55,7 @@ unit i_morph;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -102,7 +101,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.6  2005-02-14 17:13:10  peter
+  Revision 1.7  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.6  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_nwl.pas b/compiler/systems/i_nwl.pas
index e0ef25bca0..642e9d1672 100644
--- a/compiler/systems/i_nwl.pas
+++ b/compiler/systems/i_nwl.pas
@@ -37,8 +37,6 @@ unit i_nwl;
             cpu          : cpu_i386;
             unit_env     : 'NETWLIBCUNITS';
             extradefines : 'NETWARE;NETWARE_LIBC';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '.nlm';
             defext       : '.def';
             scriptext    : '.sh';
@@ -57,6 +55,7 @@ unit i_nwl;
             staticClibext : '.a';
             staticClibprefix : '';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #13#10;
             dirsep       : '/';
@@ -101,7 +100,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.4  2005-02-14 17:13:10  peter
+  Revision 1.5  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.4  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_nwm.pas b/compiler/systems/i_nwm.pas
index e5ba70e6e3..1ce14b45b4 100644
--- a/compiler/systems/i_nwm.pas
+++ b/compiler/systems/i_nwm.pas
@@ -37,8 +37,6 @@ unit i_nwm;
             cpu          : cpu_i386;
             unit_env     : 'NETWAREUNITS';
             extradefines : 'NETWARE_CLIB';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '.nlm';
             defext       : '.def';
             scriptext    : '.sh';
@@ -57,6 +55,7 @@ unit i_nwm;
             staticClibext : '.a';
             staticClibprefix : '';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #13#10;
             dirsep       : '/';
@@ -101,7 +100,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.9  2005-02-14 17:13:10  peter
+  Revision 1.10  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.9  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_os2.pas b/compiler/systems/i_os2.pas
index 1f16505be8..698845f740 100644
--- a/compiler/systems/i_os2.pas
+++ b/compiler/systems/i_os2.pas
@@ -45,8 +45,6 @@ unit i_os2;
             cpu          : cpu_i386;
             unit_env     : 'OS2UNITS';
             extradefines : '';
-            sourceext    : '.pas';
-            pasext       : '.pp';
             exeext       : '.exe';
             defext       : '.def';
             scriptext    : '.cmd';
@@ -65,6 +63,7 @@ unit i_os2;
             staticClibext : '.a';
             staticClibprefix : '';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #13#10;
             dirsep       : '\';
@@ -115,7 +114,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.8  2005-02-14 17:13:10  peter
+  Revision 1.9  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.8  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_palmos.pas b/compiler/systems/i_palmos.pas
index 0667e02c08..30bfeba62d 100644
--- a/compiler/systems/i_palmos.pas
+++ b/compiler/systems/i_palmos.pas
@@ -40,8 +40,6 @@ unit i_palmos;
             extradefines : '';
             sharedlibext : '.so';
             staticlibext : '.a';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '';
             scriptext    : '.sh';
@@ -54,6 +52,7 @@ unit i_palmos;
             resobjext    : '.or';
             staticlibprefix : 'libp';
             sharedlibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #10;
             dirsep       : '/';
@@ -91,7 +90,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.6  2005-02-14 17:13:10  peter
+  Revision 1.7  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.6  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_sunos.pas b/compiler/systems/i_sunos.pas
index d789dbe94c..4ec3297e90 100644
--- a/compiler/systems/i_sunos.pas
+++ b/compiler/systems/i_sunos.pas
@@ -37,8 +37,6 @@ unit i_sunos;
             cpu          : cpu_i386;
             unit_env     : 'SOLARISUNITS';
             extradefines : 'UNIX;LIBC';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -57,6 +55,7 @@ unit i_sunos;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -99,8 +98,6 @@ unit i_sunos;
             cpu          : cpu_SPARC;
             unit_env     : 'SOLARISUNITS';
             extradefines : 'UNIX;LIBC;';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';
@@ -119,6 +116,7 @@ unit i_sunos;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : 'lib';
+            p_ext_support : false;
             Cprefix      : '';
             newline      : #10;
             dirsep       : '/';
@@ -169,7 +167,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.7  2005-02-14 17:13:10  peter
+  Revision 1.8  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.7  2005/02/14 17:13:10  peter
     * truncate log
 
   Revision 1.6  2005/02/13 20:11:16  peter
diff --git a/compiler/systems/i_watcom.pas b/compiler/systems/i_watcom.pas
index 20dff66334..f38507f6f9 100644
--- a/compiler/systems/i_watcom.pas
+++ b/compiler/systems/i_watcom.pas
@@ -39,8 +39,6 @@ unit i_watcom;
             cpu          : cpu_i386;
             unit_env     : 'WATCOMUNITS';
             extradefines : 'DPMI';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '.exe';
             defext       : '.def';
             scriptext    : '.bat';
@@ -59,6 +57,7 @@ unit i_watcom;
             staticClibext : '.a';
             staticClibprefix : '';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #13#10;
             dirsep       : '\';
@@ -103,7 +102,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.7  2005-02-14 17:13:10  peter
+  Revision 1.8  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.7  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_wdosx.pas b/compiler/systems/i_wdosx.pas
index 654696f2a9..28bb25acda 100644
--- a/compiler/systems/i_wdosx.pas
+++ b/compiler/systems/i_wdosx.pas
@@ -37,8 +37,6 @@ unit i_wdosx;
             cpu          : cpu_i386;
             unit_env     : 'WDOSXUNITS';
             extradefines : 'MSWINDOWS';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '.exe';
             defext       : '.def';
             scriptext    : '.bat';
@@ -57,6 +55,7 @@ unit i_wdosx;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #13#10;
             dirsep       : '\';
@@ -103,7 +102,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.9  2005-02-14 17:13:10  peter
+  Revision 1.10  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.9  2005/02/14 17:13:10  peter
     * truncate log
 
 }
diff --git a/compiler/systems/i_win32.pas b/compiler/systems/i_win32.pas
index 7b4cc23658..3b95462361 100644
--- a/compiler/systems/i_win32.pas
+++ b/compiler/systems/i_win32.pas
@@ -45,8 +45,6 @@ unit i_win32;
             cpu          : cpu_i386;
             unit_env     : 'WIN32UNITS';
             extradefines : 'MSWINDOWS';
-            sourceext    : '.pp';
-            pasext       : '.pas';
             exeext       : '.exe';
             defext       : '.def';
             scriptext    : '.bat';
@@ -65,6 +63,7 @@ unit i_win32;
             staticClibext : '.a';
             staticClibprefix : 'lib';
             sharedClibprefix : '';
+            p_ext_support : false;
             Cprefix      : '_';
             newline      : #13#10;
             dirsep       : '\';
@@ -111,7 +110,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.11  2005-02-14 17:13:10  peter
+  Revision 1.12  2005-03-20 22:36:45  olle
+    * Cleaned up handling of source file extension.
+    + Added support for .p extension for macos and darwin
+
+  Revision 1.11  2005/02/14 17:13:10  peter
     * truncate log
 
 }