* Switched fcl-dbs fpmake-file to the same inclusion-mechanisn as used with gdbint. Fixes compilation of packages/fpmake.pp

git-svn-id: trunk@19984 -

packages/fcl-db/fpmake.pp

@@ -3,6 +3,9 @@
 program fpmake;
 
 uses fpmkunit;
+{$endif ALLPACKAGES}
+
+procedure add_fcl_db;
 
 const
   ParadoxOSes  = [beos,haiku,linux,freebsd,netbsd,openbsd,win32];
@@ -18,8 +21,6 @@ Var
 begin
   With Installer do
     begin
-{$endif ALLPACKAGES}
-
     P:=AddPackage('fcl-db');
 
     P.Author := '<various>';
@@ -689,11 +690,16 @@ begin
     // database.ini.txt
     // README.txt
 
-{$ifndef ALLPACKAGES}
-    Run;
     end;
+end;
+
+{$ifndef ALLPACKAGES}
+begin
+  add_fcl_db;
+  Installer.Run;
 end.
 {$endif ALLPACKAGES}
 
 
 
+

packages/fpmake_proc.inc

@@ -82,11 +82,7 @@ begin
 {$include fcl-base/fpmake.pp}
 end;
 
-procedure add_fcl_db;
-begin
-  with Installer do
 {$include fcl-db/fpmake.pp}
-end;
 
 procedure add_fcl_extra;
 begin