Merged revisions 6718-6719,6733 via svnmerge from

svn+ssh://[email protected]/FPC/svn/fpc/trunk

........
r6718 | jonas | 2007-03-04 20:35:42 +0100 (Sun, 04 Mar 2007) | 2 lines

  * fixed fpcdir setting

........
r6719 | jonas | 2007-03-04 20:59:42 +0100 (Sun, 04 Mar 2007) | 2 lines

  * fixed fcl and fpcdir paths/dependencies

........
r6733 | jonas | 2007-03-06 10:55:29 +0100 (Tue, 06 Mar 2007) | 2 lines

  * fixed require sections

........

git-svn-id: branches/fixes_2_2@6735 -

packages/base/fpmake/Makefile.fpc

@@ -13,7 +13,7 @@ units=fpmktype fpmkunit
 fpcpackage=y
 
 [default]
-fpcdir=../..
+fpcdir=../../..
 
 [rules]
 .NOTPARALLEL:

packages/base/oracle/example/Makefile.fpc

@@ -7,7 +7,7 @@ units=oraclew
 examples=test01
 
 [require]
-packages=oracle fcl
+packages=oracle fcl-base fcl-db fcl-xml
 
 [install]
 fpcpackage=y

packages/fcl-base/tests/Makefile.fpc

@@ -32,13 +32,13 @@ programs_emx=isockcli isocksvr testhres testnres testsres testrhre \
 rst=restest
 
 [require]
-packages=fcl
+packages=fcl-base fcl-db fcl-fpcunit fcl-image fcl-net fcl-passrc fcl-registry fcl-web fcl-xml
 
 [install]
 fpcpackage=y
 
 [default]
-fpcdir=../..
+fpcdir=../../..
 
 [rules]
 .NOTPARALLEL:

packages/fcl-db/tests/Makefile.fpc

@@ -12,7 +12,7 @@ examples=dbtestframework
 fpcpackage=y
 
 [default]
-fpcdir=../..
+fpcdir=../../..
 
 
 [rules]

packages/fcl-fpcunit/src/exampletests/Makefile.fpc

@@ -5,18 +5,21 @@
 [package]
 main=fcl
 
+[require]
+packages=fcl-base fcl-xml fcl-fpcunit
+
 [target]
 units=fpcunittests  money  moneytest testmockobject
 
 [compiler]
 options=-S2h
-targetdir=../../$(OS_TARGET)
+# targetdir=../../$(OS_TARGET)
 
 [install]
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../../../..
 
 [rules]
 .NOTPARALLEL:

packages/fcl-fpcunit/src/tests/Makefile.fpc

@@ -8,15 +8,18 @@ main=fcl
 [target]
 units=asserttest frameworktest suitetest
 
+[require]
+packages=fcl-base fcl-xml fcl-fpcunit
+
 [compiler]
 options=-S2h
-targetdir=../../$(OS_TARGET)
+#targetdir=../../$(OS_TARGET)
 
 [install]
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../../../..
 
 [rules]
 .NOTPARALLEL:

packages/fcl-net/src/tests/Makefile.fpc

@@ -3,7 +3,7 @@
 #
 
 [require]
-packages=fcl
+packages=fcl-base fcl-xml fcl-net
 
 [target]
 programs=rpcserv rpccli
@@ -16,7 +16,7 @@ options=-S2h
 fpcpackage=y
 
 [default]
-fpcdir=../../..
+fpcdir=../../../..
 
 
 [rules]

utils/fpcm/Makefile.fpc

@@ -10,7 +10,7 @@ rsts=fpcmmain
 units=fpcmmain fpcmdic fpcmwr fpcmpkg
 
 [require]
-packages=fcl
+packages=fcl-base
 tools=data2inc
 
 [install]

utils/fpdoc/fpde/Makefile.fpc

@@ -7,7 +7,7 @@ name=fpde
 version=2.0.0
 
 [require]
-packages=fcl fpgtk
+packages=fcl-base fcl-xml fcl-passrc fpgtk
 
 [target]
 programs=fpde

utils/fpmc/Makefile.fpc

@@ -12,7 +12,7 @@ rsts=frmabout frmmain frmoptions msgcomp
 units=frmmain msgcomp frmabout frmoptions
 
 [require]
-packages=fcl fpgtk
+packages=fcl-base fpgtk
 
 [compiler]