--- Merging r16943 into '.':

U    utils/fpcmkcfg/fpcmkcfg.pp
--- Merging r16944 into '.':
U    utils/fpcmkcfg/fpccfg.inc
U    utils/fpcmkcfg/fpc.cft

# revisions: 16943,16944
------------------------------------------------------------------------
r16943 | joost | 2011-02-19 20:27:52 +0100 (Sat, 19 Feb 2011) | 1 line
Changed paths:
   M /trunk/utils/fpcmkcfg/fpcmkcfg.pp

 * Also show builtin templates other than the default
------------------------------------------------------------------------
------------------------------------------------------------------------
r16944 | joost | 2011-02-19 21:32:40 +0100 (Sat, 19 Feb 2011) | 1 line
Changed paths:
   M /trunk/utils/fpcmkcfg/fpc.cft
   M /trunk/utils/fpcmkcfg/fpccfg.inc

 * Fixed the order in which the httpd-units are searched for. Already fixed for samplecfg in r16722
------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@16969 -

utils/fpcmkcfg/fpc.cft

@@ -122,6 +122,11 @@
 #-Fr%basepath%/msg/errord.msg
 #-Fr%basepath%/msg/errorr.msg
 
+# searchpath for units and other system dependent things
+-Fu%basepath%/units/$FPCTARGET/
+-Fu%basepath%/units/$FPCTARGET/*
+-Fu%basepath%/units/$FPCTARGET/rtl
+
 #IFDEF FPCAPACHE_1_13
 -Fu%basepath%/units/$FPCTARGET/httpd13/
 #ELSE
@@ -132,11 +137,6 @@
 #ENDIF
 #ENDIF
 
-# searchpath for units and other system dependent things
--Fu%basepath%/units/$FPCTARGET/
--Fu%basepath%/units/$FPCTARGET/*
--Fu%basepath%/units/$FPCTARGET/rtl
-
 # path to the gcclib
 %gcclibpath%
 

utils/fpcmkcfg/fpccfg.inc

@@ -135,21 +135,21 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '#-Fr%basepath%/msg/errord.msg'#010+
   '#-Fr%basepath%/msg/errorr.msg'#010+
   #010+
+  '# searchpath for units and other system dependent things'#010+
+  '-Fu%basepath%/units/$FPCTARGET/'#010+
+  '-Fu%basepath%/units/$FPCTARGET/*'#010+
+  '-Fu%basepath%/units/$FPCTARGET/rtl',#010+
+  #010+
   '#IFDEF FPCAPACHE_1_13'#010+
   '-Fu%basepath%/units/$FPCTARGET/httpd13/'#010+
   '#ELSE'#010+
   '#IFDEF FPCAPACHE_2_0'#010+
   '-Fu%basepath%/units/$FPCTARGET/httpd20'#010+
   '#ELSE'#010+
-  '-Fu%basepath%/units/$F','PCTARGET/httpd22'#010+
+  '-Fu%basepath%/units/$FPCTARGET/httpd22'#010+
   '#ENDIF'#010+
   '#ENDIF'#010+
   #010+
-  '# searchpath for units and other system dependent things'#010+
-  '-Fu%basepath%/units/$FPCTARGET/'#010+
-  '-Fu%basepath%/units/$FPCTARGET/*'#010+
-  '-Fu%basepath%/units/$FPCTARGET/rtl'#010+
-  #010+
   '# path to the gcclib'#010+
   '%gcclibpath%'#010+
   #010+

utils/fpcmkcfg/fpcmkcfg.pp

@@ -321,6 +321,7 @@ Procedure ProcessCommandline;
 Var
   I : Integer;
   S : String;
+  ShowBuiltinCommand : boolean;
 
   Function GetOptArg : String;
 
@@ -361,10 +362,7 @@ begin
       case S[2] of
         'v' : Verbose:=True;
         'h' : Usage;
-        'b' : begin
-              ShowBuiltin;
-              halt(0);
-              end;
+        'b' : ShowBuiltinCommand := true;
         'm' : begin
               ShowBuiltinMacros;
               halt(0);
@@ -409,6 +407,11 @@ begin
 
     TemplateParser.Values['TEMPLATEFILE'] := 'builtin';
     end;
+  if ShowBuiltinCommand then
+    begin
+    ShowBuiltIn;
+    halt(0);
+    end;
 end;