Ver código fonte

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

git-svn-id: trunk@16944 -
joost 14 anos atrás
pai
commit
80ec9bb7bc
2 arquivos alterados com 11 adições e 11 exclusões
  1. 5 5
      utils/fpcmkcfg/fpc.cft
  2. 6 6
      utils/fpcmkcfg/fpccfg.inc

+ 5 - 5
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%
 

+ 6 - 6
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+