paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-11 09:26:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: trunk@16944 -
This commit is contained in:
joost 2011-02-19 20:32:40 +00:00
parent 9b077ad93b
commit 80ec9bb7bc
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/fpcmkcfg/fpc.cft
View File

@ -122,6 +122,11 @@
#-Fr%basepath%/msg/errord.msg #-Fr%basepath%/msg/errord.msg
#-Fr%basepath%/msg/errorr.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 #IFDEF FPCAPACHE_1_13
-Fu%basepath%/units/$FPCTARGET/httpd13/ -Fu%basepath%/units/$FPCTARGET/httpd13/
#ELSE #ELSE
@ -132,11 +137,6 @@
#ENDIF #ENDIF
#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 # path to the gcclib
%gcclibpath% %gcclibpath%

12
utils/fpcmkcfg/fpccfg.inc
View File

@ -135,21 +135,21 @@ const DefaultConfig : array[0..23,1..240] of char=(
'#-Fr%basepath%/msg/errord.msg'#010+ '#-Fr%basepath%/msg/errord.msg'#010+
'#-Fr%basepath%/msg/errorr.msg'#010+ '#-Fr%basepath%/msg/errorr.msg'#010+
#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+ '#IFDEF FPCAPACHE_1_13'#010+
'-Fu%basepath%/units/$FPCTARGET/httpd13/'#010+ '-Fu%basepath%/units/$FPCTARGET/httpd13/'#010+
'#ELSE'#010+ '#ELSE'#010+
'#IFDEF FPCAPACHE_2_0'#010+ '#IFDEF FPCAPACHE_2_0'#010+
'-Fu%basepath%/units/$FPCTARGET/httpd20'#010+ '-Fu%basepath%/units/$FPCTARGET/httpd20'#010+
'#ELSE'#010+ '#ELSE'#010+
'-Fu%basepath%/units/$F','PCTARGET/httpd22'#010+ '-Fu%basepath%/units/$FPCTARGET/httpd22'#010+
'#ENDIF'#010+ '#ENDIF'#010+
'#ENDIF'#010+ '#ENDIF'#010+
#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+ '# path to the gcclib'#010+
'%gcclibpath%'#010+ '%gcclibpath%'#010+
#010+ #010+