* Handle the location of each package at run-time, not at compilation time

 * Added a fpmake.pp in the root, to compile the utils and packages in one go

git-svn-id: trunk@24783 -

.gitattributes

@@ -822,6 +822,9 @@ compiler/x86_64/x8664nop.inc svneol=native#text/plain
 compiler/x86_64/x8664op.inc svneol=native#text/plain
 compiler/x86_64/x8664pro.inc svneol=native#text/plain
 compiler/x86_64/x8664tab.inc svneol=native#text/plain
+/fpmake.pp svneol=native#text/plain
+/fpmake_add1.inc svneol=native#text/plain
+/fpmake_proc1.inc svneol=native#text/plain
 ide/Makefile svneol=native#text/plain
 ide/Makefile.fpc svneol=native#text/plain
 ide/Makefile.fpc.fpcmake svneol=native#text/plain

fpmake.pp

@@ -0,0 +1,56 @@
+{$mode objfpc}{$H+}
+{$define allpackages}
+program fpmake;
+
+{$IFDEF OS2}
+ {$DEFINE NO_UNIT_PROCESS}
+{$ENDIF OS2}
+
+{$IFDEF GO32V2}
+ {$DEFINE NO_UNIT_PROCESS}
+{$ENDIF GO32V2}
+
+{$ifndef NO_UNIT_PROCESS}
+  {$define HAS_UNIT_PROCESS}
+{$endif NO_UNIT_PROCESS}
+
+uses
+  fpmkunit,
+  classes,
+{$IFDEF HAS_UNIT_PROCESS}
+  process,
+{$ENDIF HAS_UNIT_PROCESS}
+  sysutils;
+
+
+Var
+  TBuild,T : TTarget;
+  PBuild,P : TPackage;
+  D : TDependency;
+  I : Integer;
+
+(*
+
+The include files are generated with the following commands:
+
+rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s(const ADirectory: string);\nbegin\n  with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo "  add_$cleanedname(ADirectory+IncludeTrailingPathDelimiter('$cleanedname'));" >> fpmake_add.inc; done
+
+*)
+
+{$include fpmake_proc1.inc}
+
+procedure add_fpc(const ADirectory: string);
+
+begin
+{$include fpmake_add1.inc}
+
+end;
+
+begin
+  add_fpc('');
+  Installer.Run;
+end.
+
+
+
+

fpmake_add1.inc

@@ -0,0 +1,4 @@
+  //add_ide(IncludeTrailingPathDelimiter(ADirectory+'ide'));
+  add_packages(ADirectory+IncludeTrailingPathDelimiter('packages'));
+  //add_rtl(IncludeTrailingPathDelimiter(ADirectory+'rtl'));
+  add_utils(IncludeTrailingPathDelimiter(ADirectory+'utils'));

fpmake_proc1.inc

@@ -0,0 +1,14 @@
+{ $include ide/fpmake.pp}
+
+{$include packages/fpmake.pp}
+
+(*
+procedure add_rtl(const ADirectory: string);
+begin
+  with Installer do
+{$include rtl/fpmake.pp}
+end;
+*)
+
+{$include utils/fpmake.pp}
+

ide/fpmake.pp

@@ -118,7 +118,7 @@ begin
     end;
 end;
 
-procedure add_ide;
+procedure add_ide(const ADirectory: string);
 
 Var
   P : TPackage;
@@ -139,6 +139,9 @@ begin
 
     P:=AddPackage('ide');
     P.Version:='2.7.1';
+{$ifdef ALLPACKAGES}
+    P.Directory:=ADirectory;
+{$endif ALLPACKAGES}
 
     P.Dependencies.Add('rtl');
     P.Dependencies.Add('fv');
@@ -210,7 +213,7 @@ end;
 
 {$ifndef ALLPACKAGES}
 begin
-  add_ide;
+  add_ide('');
   Installer.Run;
 end.
 {$endif ALLPACKAGES}

packages/a52/fpmake.pp

@@ -23,7 +23,7 @@ begin
     P.OSes := [linux.win32];
 
 {$ifdef ALLPACKAGES}
-    P.Directory:='a52';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/amunits/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('amunits');
 {$ifdef ALLPACKAGES}
-    P.Directory:='amunits';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/aspell/fpmake.pp

@@ -13,9 +13,11 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('aspell');
+
 {$ifdef ALLPACKAGES}
-    P.Directory:='aspell';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
+
     P.Version:='2.7.1';
 
     P.Author := 'header:Aleš Katona, library: Kevin Atkinson';

packages/bfd/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('bfd');
 {$ifdef ALLPACKAGES}
-    P.Directory:='bfd';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: Cygnus Support, header: by Uli Tessel';

packages/bzip2/fpmake.pp

@@ -13,9 +13,11 @@ begin
 {$endif ALLPACKAGES}
 
     P:=AddPackage('bzip2');
+
 {$ifdef ALLPACKAGES}
-    P.Directory:='bzip2';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
+
     P.Version:='2.7.1';
 
     P.Version:='2.7.1';

packages/cairo/fpmake.pp

@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
     P:=AddPackage('cairo');
 {$ifdef ALLPACKAGES}
-    P.Directory:='cairo';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author :=  'Library:  University of Southern California + Red Hat Inc., header: Luiz AmXrico Pereira CXmara';

packages/cdrom/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('cdrom');
 {$ifdef ALLPACKAGES}
-    P.Directory:='cdrom';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes:=[Win32,Win64,Linux];

packages/chm/fpmake.pp

@@ -15,7 +15,7 @@ begin
 
     P:=AddPackage('chm');
 {$ifdef ALLPACKAGES}
-    P.Directory:='chm';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/cocoaint/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('cocoaint');
 {$ifdef ALLPACKAGES}
-    P.Directory:='cocoaint';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.CPUs:=[i386,x86_64,powerpc,powerpc64];

packages/dblib/fpmake.pp

@@ -6,7 +6,7 @@ uses fpmkunit;
 
 {$endif not ALLPACKAGES}
 
-procedure add_dblib;
+procedure add_dblib(const ADirectory: string);
 
 Const
   DBLibOSes         = [linux,freebsd,netbsd,openbsd,solaris,win32,win64,haiku,android];
@@ -18,9 +18,7 @@ begin
   With Installer do
     begin
       P:=AddPackage('dblib');
-{$ifdef ALLPACKAGES}
-      P.Directory:='dblib';
-{$endif ALLPACKAGES}
+      P.Directory:=ADirectory;
       P.Version:='1.0';
       P.Author := 'Library: (FreeTDS/Microsoft), header: Ladislav Karrach';
       P.License := 'Library: FreeTDS License, header: LGPL with modification, ';
@@ -38,7 +36,7 @@ end;
 
 {$ifndef ALLPACKAGES}
 begin
-  add_dblib;
+  add_dblib('');
   Installer.Run;
 end.
 {$endif ALLPACKAGES}

packages/dbus/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('dbus');
 {$ifdef ALLPACKAGES}
-    P.Directory:='dbus';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/dts/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('dts');
 {$ifdef ALLPACKAGES}
-    P.Directory:='dts';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/fastcgi/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fastcgi');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fastcgi';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/fcl-async/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-async');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-async';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/fcl-base/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-base');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-base';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('univint',[Darwin,iPhoneSim]);

packages/fcl-db/fpmake.pp

@@ -5,7 +5,7 @@ program fpmake;
 uses fpmkunit;
 {$endif ALLPACKAGES}
 
-procedure add_fcl_db;
+procedure add_fcl_db(const ADirectory: string);
 
 const
   ParadoxOSes         = [beos,haiku,linux,freebsd,netbsd,openbsd,win32];
@@ -34,9 +34,7 @@ begin
     P.NeedLibC:= false;
     P.OSes:=AllOSes-[embedded];
 
-{$ifdef ALLPACKAGES}
-    P.Directory:='fcl-db';
-{$endif ALLPACKAGES}
+    P.Directory:=ADirectory;
     P.Version:='2.7.1';
     P.SourcePath.Add('src');
     P.SourcePath.Add('src/base');
@@ -774,7 +772,7 @@ end;
 
 {$ifndef ALLPACKAGES}
 begin
-  add_fcl_db;
+  add_fcl_db('');
   Installer.Run;
 end.
 {$endif ALLPACKAGES}

packages/fcl-extra/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-extra');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-extra';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('fcl-base');

packages/fcl-fpcunit/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-fpcunit');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-fpcunit';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('paszlib');

packages/fcl-image/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-image');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-image';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('pasjpeg');

packages/fcl-js/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-js');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-js';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Michael Van Canneyt';

packages/fcl-json/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-json');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-json';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('fcl-base');

packages/fcl-net/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-net');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-net';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('fcl-base');

packages/fcl-passrc/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-passrc');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-passrc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('fcl-base');

packages/fcl-process/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-process');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-process';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Michael van Canneyt and Free Pascal Development team';

packages/fcl-registry/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-registry');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-registry';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('fcl-base');

packages/fcl-res/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-res');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-res';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Giulio Bernardi';

packages/fcl-sdo/fpmake.pp

@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
     P:=AddPackage('fcl-sdo');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-sdo';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Dependencies.Add('fcl-base');
     P.Dependencies.Add('fcl-xml');

packages/fcl-stl/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-stl');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-stl';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
 
     P.Version:='2.7.1';

packages/fcl-web/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fcl-web');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-web';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,win32,win64,wince,aix];

packages/fcl-xml/fpmake.pp

@@ -15,7 +15,7 @@ begin
 
     P:=AddPackage('fcl-xml');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fcl-xml';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Options.Add('-S2h');

packages/fftw/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fftw');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fftw';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/fpgtk/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fpgtk');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fpgtk';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [beos,haiku,freebsd,solaris,netbsd,openbsd,linux,win32,win64,os2,emx,aix];

packages/fpindexer/fpmake.pp

@@ -5,7 +5,7 @@ program fpmake;
 uses fpmkunit;
 {$endif ALLPACKAGES}
 
-procedure add_fpindexer;
+procedure add_fpindexer(const ADirectory: string);
 Const
   SqldbConnectionOSes = [beos,haiku,linux,freebsd,win32,win64,wince,darwin,iphonesim,netbsd,openbsd,aix];
   SqliteOSes          = [beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,win32,wince,aix];
@@ -17,9 +17,7 @@ begin
   With Installer do
     begin
       P:=AddPackage('fpindexer');
-{$ifdef ALLPACKAGES}
-      P.Directory:='fpindexer';
-{$endif ALLPACKAGES}
+      P.Directory:=ADirectory;
       P.Version:='2.7.1';
       P.OSes := [beos,haiku,freebsd,darwin,solaris,netbsd,openbsd,linux,win32,win64,wince,aix];
       P.Dependencies.Add('fcl-base');
@@ -71,7 +69,7 @@ end;
     
 {$ifndef ALLPACKAGES}
 begin
-  add_fpindexer;
+  add_fpindexer('');
   Installer.Run;
 end.
 {$endif ALLPACKAGES}

packages/fpmake.pp

@@ -1,5 +1,7 @@
-{$mode objfpc}{$H+}
+{$ifndef ALLPACKAGES}
 {$define allpackages}
+{$define no_parent}
+{$mode objfpc}{$H+}
 program fpmake;
 
 uses fpmkunit, sysutils, Classes;
@@ -10,16 +12,20 @@ Var
   D : TDependency;
   I : Integer;
 
+{$endif ALLPACKAGES}
+
 (*
 
 The include files are generated with the following commands:
 
-rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s;\nbegin\n  with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo "  add_$cleanedname;" >> fpmake_add.inc; done
+rm fpmake_proc.inc fpmake_add.inc ; /bin/ls -1 */fpmake.pp| while read file; do cleanedname=`dirname $file | sed -e 's+-+_+g'` ; if ! `grep -i "^procedure add_$cleanedname" $file >/dev/null` ; then printf 'procedure add_%s(const ADirectory: string);\nbegin\n  with Installer do\n{$include %s}\nend;\n\n' $cleanedname $file >> fpmake_proc.inc; else printf '{$include %s}\n\n' $file >> fpmake_proc.inc; fi; echo "  add_$cleanedname(ADirectory+IncludeTrailingPathDelimiter('$cleanedname'));" >> fpmake_add.inc; done
 
 *)
 
 {$include fpmake_proc.inc}
 
+procedure add_packages(const ADirectory: string);
+
 begin
 {$include fpmake_add.inc}
 
@@ -28,6 +34,12 @@ begin
       // Create fpc-all package
       PBuild:=AddPackage('fpc-all');
       PBuild.Version:='2.7.1';
-      Run;
     end;
+end;
+
+{$ifdef no_parent}
+begin
+  add_packages('');
+  Installer.Run;
 end.
+{$endif no_parent}

packages/fpmake_add.inc

@@ -1,116 +1,116 @@
-  add_a52;
-  add_amunits;
-  add_aspell;
-  add_bfd;
-  add_bzip2;
-  add_cairo;
-  add_cdrom;
-  add_chm;
-  add_cocoaint;
-  add_dblib;
-  add_dbus;
-  add_dts;
-  add_fastcgi;
-  add_fcl_async;
-  add_fcl_base;
-  add_fcl_db;
-  add_fcl_extra;
-  add_fcl_fpcunit;
-  add_fcl_image;
-  add_fcl_js;
-  add_fcl_json;
-  add_fcl_net;
-  add_fcl_passrc;
-  add_fcl_process;
-  add_fcl_registry;
-  add_fcl_res;
-  add_fcl_sdo;
-  add_fcl_stl;
-  add_fcl_web;
-  add_fcl_xml;
-  add_fftw;
-  add_fpgtk;
-  add_fpindexer;
-  add_fpmkunit;
-  add_fppkg;
-  add_fv;
-  add_gdbint;
-  add_gdbm;
-  add_ggi;
-  add_gmp;
-  add_gnome1;
-  add_graph;
-  add_gtk1;
-  add_gtk2;
-  add_hash;
-  add_hermes;
-  add_httpd13;
-  add_httpd20;
-  add_httpd22;
-  add_httpd24;
-  add_ibase;
-  add_iconvenc;
-  add_imagemagick;
-  add_imlib;
-  add_jni;
-  add_ldap;
-  add_libc;
-  add_libcurl;
-  add_libgbafpc;
-  add_libgd;
-  add_libndsfpc;
-  add_libogcfpc;
-  add_libpng;
-  add_librsvg;
-  add_libsee;
-  add_libtar;
-  add_libvlc;
-  add_libxml;
-  add_lua;
-  add_mad;
-  add_modplug;
-  add_mysql;
-  add_ncurses;
-  add_newt;
-  add_numlib;
-  add_nvapi;
-  add_objcrtl;
-  add_odbc;
-  add_oggvorbis;
-  add_openal;
-  add_opencl;
-  add_opengles;
-  add_opengl;
-  add_openssl;
-  add_oracle;
-  add_os2units;
-  add_palmunits;
-  add_pasjpeg;
-  add_paszlib;
-  add_pcap;
-  add_postgres;
-  add_proj4;
-  add_ptc;
-  add_pthreads;
-  add_pxlib;
-  add_regexpr;
-  add_rexx;
-  add_sdl;
-  add_sqlite;
-  add_svgalib;
-  add_symbolic;
-  add_syslog;
-  add_tcl;
-  add_univint;
-  add_unixutil;
-  add_unzip;
-  add_users;
-  add_utmp;
-  add_uuid;
-  add_winceunits;
-  add_winunits_base;
-  add_winunits_jedi;
-  add_x11;
-  add_xforms;
-  add_zlib;
-  add_zorba;
+  add_a52(ADirectory+IncludeTrailingPathDelimiter('a52'));
+  add_amunits(ADirectory+IncludeTrailingPathDelimiter('amunits'));
+  add_aspell(ADirectory+IncludeTrailingPathDelimiter('aspell'));
+  add_bfd(ADirectory+IncludeTrailingPathDelimiter('bfd'));
+  add_bzip2(ADirectory+IncludeTrailingPathDelimiter('bzip2'));
+  add_cairo(ADirectory+IncludeTrailingPathDelimiter('cairo'));
+  add_cdrom(ADirectory+IncludeTrailingPathDelimiter('cdrom'));
+  add_chm(ADirectory+IncludeTrailingPathDelimiter('chm'));
+  add_cocoaint(ADirectory+IncludeTrailingPathDelimiter('cocoaint'));
+  add_dblib(ADirectory+IncludeTrailingPathDelimiter('dblib'));
+  add_dbus(ADirectory+IncludeTrailingPathDelimiter('dbus'));
+  add_dts(ADirectory+IncludeTrailingPathDelimiter('dts'));
+  add_fastcgi(ADirectory+IncludeTrailingPathDelimiter('fastcgi'));
+  add_fcl_async(ADirectory+IncludeTrailingPathDelimiter('fcl-async'));
+  add_fcl_base(ADirectory+IncludeTrailingPathDelimiter('fcl-base'));
+  add_fcl_db(ADirectory+IncludeTrailingPathDelimiter('fcl-db'));
+  add_fcl_extra(ADirectory+IncludeTrailingPathDelimiter('fcl-extra'));
+  add_fcl_fpcunit(ADirectory+IncludeTrailingPathDelimiter('fcl-fpcunit'));
+  add_fcl_image(ADirectory+IncludeTrailingPathDelimiter('fcl-image'));
+  add_fcl_js(ADirectory+IncludeTrailingPathDelimiter('fcl-js'));
+  add_fcl_json(ADirectory+IncludeTrailingPathDelimiter('fcl-json'));
+  add_fcl_net(ADirectory+IncludeTrailingPathDelimiter('fcl-net'));
+  add_fcl_passrc(ADirectory+IncludeTrailingPathDelimiter('fcl-passrc'));
+  add_fcl_process(ADirectory+IncludeTrailingPathDelimiter('fcl-process'));
+  add_fcl_registry(ADirectory+IncludeTrailingPathDelimiter('fcl-registry'));
+  add_fcl_res(ADirectory+IncludeTrailingPathDelimiter('fcl-res'));
+  add_fcl_sdo(ADirectory+IncludeTrailingPathDelimiter('fcl-sdo'));
+  add_fcl_stl(ADirectory+IncludeTrailingPathDelimiter('fcl-stl'));
+  add_fcl_web(ADirectory+IncludeTrailingPathDelimiter('fcl-web'));
+  add_fcl_xml(ADirectory+IncludeTrailingPathDelimiter('fcl-xml'));
+  add_fftw(ADirectory+IncludeTrailingPathDelimiter('fftw'));
+  add_fpgtk(ADirectory+IncludeTrailingPathDelimiter('fpgtk'));
+  add_fpindexer(ADirectory+IncludeTrailingPathDelimiter('fpindexer'));
+  add_fpmkunit(ADirectory+IncludeTrailingPathDelimiter('fpmkunit'));
+  add_fppkg(ADirectory+IncludeTrailingPathDelimiter('fppkg'));
+  add_fv(ADirectory+IncludeTrailingPathDelimiter('fv'));
+  add_gdbint(ADirectory+IncludeTrailingPathDelimiter('gdbint'));
+  add_gdbm(ADirectory+IncludeTrailingPathDelimiter('gdbm'));
+  add_ggi(ADirectory+IncludeTrailingPathDelimiter('ggi'));
+  add_gmp(ADirectory+IncludeTrailingPathDelimiter('gmp'));
+  add_gnome1(ADirectory+IncludeTrailingPathDelimiter('gnome1'));
+  add_graph(ADirectory+IncludeTrailingPathDelimiter('graph'));
+  add_gtk1(ADirectory+IncludeTrailingPathDelimiter('gtk1'));
+  add_gtk2(ADirectory+IncludeTrailingPathDelimiter('gtk2'));
+  add_hash(ADirectory+IncludeTrailingPathDelimiter('hash'));
+  add_hermes(ADirectory+IncludeTrailingPathDelimiter('hermes'));
+  add_httpd13(ADirectory+IncludeTrailingPathDelimiter('httpd13'));
+  add_httpd20(ADirectory+IncludeTrailingPathDelimiter('httpd20'));
+  add_httpd22(ADirectory+IncludeTrailingPathDelimiter('httpd22'));
+  add_httpd24(ADirectory+IncludeTrailingPathDelimiter('httpd24'));
+  add_ibase(ADirectory+IncludeTrailingPathDelimiter('ibase'));
+  add_iconvenc(ADirectory+IncludeTrailingPathDelimiter('iconvenc'));
+  add_imagemagick(ADirectory+IncludeTrailingPathDelimiter('imagemagick'));
+  add_imlib(ADirectory+IncludeTrailingPathDelimiter('imlib'));
+  add_jni(ADirectory+IncludeTrailingPathDelimiter('jni'));
+  add_ldap(ADirectory+IncludeTrailingPathDelimiter('ldap'));
+  add_libc(ADirectory+IncludeTrailingPathDelimiter('libc'));
+  add_libcurl(ADirectory+IncludeTrailingPathDelimiter('libcurl'));
+  add_libgbafpc(ADirectory+IncludeTrailingPathDelimiter('libgbafpc'));
+  add_libgd(ADirectory+IncludeTrailingPathDelimiter('libgd'));
+  add_libndsfpc(ADirectory+IncludeTrailingPathDelimiter('libndsfpc'));
+  add_libogcfpc(ADirectory+IncludeTrailingPathDelimiter('libogcfpc'));
+  add_libpng(ADirectory+IncludeTrailingPathDelimiter('libpng'));
+  add_librsvg(ADirectory+IncludeTrailingPathDelimiter('librsvg'));
+  add_libsee(ADirectory+IncludeTrailingPathDelimiter('libsee'));
+  add_libtar(ADirectory+IncludeTrailingPathDelimiter('libtar'));
+  add_libvlc(ADirectory+IncludeTrailingPathDelimiter('libvlc'));
+  add_libxml(ADirectory+IncludeTrailingPathDelimiter('libxml'));
+  add_lua(ADirectory+IncludeTrailingPathDelimiter('lua'));
+  add_mad(ADirectory+IncludeTrailingPathDelimiter('mad'));
+  add_modplug(ADirectory+IncludeTrailingPathDelimiter('modplug'));
+  add_mysql(ADirectory+IncludeTrailingPathDelimiter('mysql'));
+  add_ncurses(ADirectory+IncludeTrailingPathDelimiter('ncurses'));
+  add_newt(ADirectory+IncludeTrailingPathDelimiter('newt'));
+  add_numlib(ADirectory+IncludeTrailingPathDelimiter('numlib'));
+  add_nvapi(ADirectory+IncludeTrailingPathDelimiter('nvapi'));
+  add_objcrtl(ADirectory+IncludeTrailingPathDelimiter('objcrtl'));
+  add_odbc(ADirectory+IncludeTrailingPathDelimiter('odbc'));
+  add_oggvorbis(ADirectory+IncludeTrailingPathDelimiter('oggvorbis'));
+  add_openal(ADirectory+IncludeTrailingPathDelimiter('openal'));
+  add_opencl(ADirectory+IncludeTrailingPathDelimiter('opencl'));
+  add_opengl(ADirectory+IncludeTrailingPathDelimiter('opengl'));
+  add_opengles(ADirectory+IncludeTrailingPathDelimiter('opengles'));
+  add_openssl(ADirectory+IncludeTrailingPathDelimiter('openssl'));
+  add_oracle(ADirectory+IncludeTrailingPathDelimiter('oracle'));
+  add_os2units(ADirectory+IncludeTrailingPathDelimiter('os2units'));
+  add_palmunits(ADirectory+IncludeTrailingPathDelimiter('palmunits'));
+  add_pasjpeg(ADirectory+IncludeTrailingPathDelimiter('pasjpeg'));
+  add_paszlib(ADirectory+IncludeTrailingPathDelimiter('paszlib'));
+  add_pcap(ADirectory+IncludeTrailingPathDelimiter('pcap'));
+  add_postgres(ADirectory+IncludeTrailingPathDelimiter('postgres'));
+  add_proj4(ADirectory+IncludeTrailingPathDelimiter('proj4'));
+  add_ptc(ADirectory+IncludeTrailingPathDelimiter('ptc'));
+  add_pthreads(ADirectory+IncludeTrailingPathDelimiter('pthreads'));
+  add_pxlib(ADirectory+IncludeTrailingPathDelimiter('pxlib'));
+  add_regexpr(ADirectory+IncludeTrailingPathDelimiter('regexpr'));
+  add_rexx(ADirectory+IncludeTrailingPathDelimiter('rexx'));
+  add_sdl(ADirectory+IncludeTrailingPathDelimiter('sdl'));
+  add_sqlite(ADirectory+IncludeTrailingPathDelimiter('sqlite'));
+  add_svgalib(ADirectory+IncludeTrailingPathDelimiter('svgalib'));
+  add_symbolic(ADirectory+IncludeTrailingPathDelimiter('symbolic'));
+  add_syslog(ADirectory+IncludeTrailingPathDelimiter('syslog'));
+  add_tcl(ADirectory+IncludeTrailingPathDelimiter('tcl'));
+  add_univint(ADirectory+IncludeTrailingPathDelimiter('univint'));
+  add_unixutil(ADirectory+IncludeTrailingPathDelimiter('unixutil'));
+  add_unzip(ADirectory+IncludeTrailingPathDelimiter('unzip'));
+  add_users(ADirectory+IncludeTrailingPathDelimiter('users'));
+  add_utmp(ADirectory+IncludeTrailingPathDelimiter('utmp'));
+  add_uuid(ADirectory+IncludeTrailingPathDelimiter('uuid'));
+  add_winceunits(ADirectory+IncludeTrailingPathDelimiter('winceunits'));
+  add_winunits_base(ADirectory+IncludeTrailingPathDelimiter('winunits_base'));
+  add_winunits_jedi(ADirectory+IncludeTrailingPathDelimiter('winunits_jedi'));
+  add_x11(ADirectory+IncludeTrailingPathDelimiter('x11'));
+  add_xforms(ADirectory+IncludeTrailingPathDelimiter('xforms'));
+  add_zlib(ADirectory+IncludeTrailingPathDelimiter('zlib'));
+  add_zorba(ADirectory+IncludeTrailingPathDelimiter('zorba'));

packages/fpmake_proc.inc

@@ -1,52 +1,52 @@
-procedure add_a52;
+procedure add_a52(const ADirectory: string);
 begin
   with Installer do
 {$include a52/fpmake.pp}
 end;
 
-procedure add_amunits;
+procedure add_amunits(const ADirectory: string);
 begin
   with Installer do
 {$include amunits/fpmake.pp}
 end;
 
-procedure add_aspell;
+procedure add_aspell(const ADirectory: string);
 begin
   with Installer do
 {$include aspell/fpmake.pp}
 end;
 
-procedure add_bfd;
+procedure add_bfd(const ADirectory: string);
 begin
   with Installer do
 {$include bfd/fpmake.pp}
 end;
 
-procedure add_bzip2;
+procedure add_bzip2(const ADirectory: string);
 begin
   with Installer do
 {$include bzip2/fpmake.pp}
 end;
 
-procedure add_cairo;
+procedure add_cairo(const ADirectory: string);
 begin
   with Installer do
 {$include cairo/fpmake.pp}
 end;
 
-procedure add_cdrom;
+procedure add_cdrom(const ADirectory: string);
 begin
   with Installer do
 {$include cdrom/fpmake.pp}
 end;
 
-procedure add_chm;
+procedure add_chm(const ADirectory: string);
 begin
   with Installer do
 {$include chm/fpmake.pp}
 end;
 
-procedure add_cocoaint;
+procedure add_cocoaint(const ADirectory: string);
 begin
   with Installer do
 {$include cocoaint/fpmake.pp}
@@ -54,31 +54,31 @@ end;
 
 {$include dblib/fpmake.pp}
 
-procedure add_dbus;
+procedure add_dbus(const ADirectory: string);
 begin
   with Installer do
 {$include dbus/fpmake.pp}
 end;
 
-procedure add_dts;
+procedure add_dts(const ADirectory: string);
 begin
   with Installer do
 {$include dts/fpmake.pp}
 end;
 
-procedure add_fastcgi;
+procedure add_fastcgi(const ADirectory: string);
 begin
   with Installer do
 {$include fastcgi/fpmake.pp}
 end;
 
-procedure add_fcl_async;
+procedure add_fcl_async(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-async/fpmake.pp}
 end;
 
-procedure add_fcl_base;
+procedure add_fcl_base(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-base/fpmake.pp}
@@ -86,97 +86,97 @@ end;
 
 {$include fcl-db/fpmake.pp}
 
-procedure add_fcl_extra;
+procedure add_fcl_extra(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-extra/fpmake.pp}
 end;
 
-procedure add_fcl_fpcunit;
+procedure add_fcl_fpcunit(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-fpcunit/fpmake.pp}
 end;
 
-procedure add_fcl_image;
+procedure add_fcl_image(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-image/fpmake.pp}
 end;
 
-procedure add_fcl_js;
+procedure add_fcl_js(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-js/fpmake.pp}
 end;
 
-procedure add_fcl_json;
+procedure add_fcl_json(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-json/fpmake.pp}
 end;
 
-procedure add_fcl_net;
+procedure add_fcl_net(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-net/fpmake.pp}
 end;
 
-procedure add_fcl_passrc;
+procedure add_fcl_passrc(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-passrc/fpmake.pp}
 end;
 
-procedure add_fcl_process;
+procedure add_fcl_process(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-process/fpmake.pp}
 end;
 
-procedure add_fcl_registry;
+procedure add_fcl_registry(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-registry/fpmake.pp}
 end;
 
-procedure add_fcl_res;
+procedure add_fcl_res(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-res/fpmake.pp}
 end;
 
-procedure add_fcl_sdo;
+procedure add_fcl_sdo(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-sdo/fpmake.pp}
 end;
 
-procedure add_fcl_stl;
+procedure add_fcl_stl(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-stl/fpmake.pp}
 end;
 
-procedure add_fcl_web;
+procedure add_fcl_web(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-web/fpmake.pp}
 end;
 
-procedure add_fcl_xml;
+procedure add_fcl_xml(const ADirectory: string);
 begin
   with Installer do
 {$include fcl-xml/fpmake.pp}
 end;
 
-procedure add_fftw;
+procedure add_fftw(const ADirectory: string);
 begin
   with Installer do
 {$include fftw/fpmake.pp}
 end;
 
-procedure add_fpgtk;
+procedure add_fpgtk(const ADirectory: string);
 begin
   with Installer do
 {$include fpgtk/fpmake.pp}
@@ -184,7 +184,7 @@ end;
 
 {$include fpindexer/fpmake.pp}
 
-procedure add_fpmkunit;
+procedure add_fpmkunit(const ADirectory: string);
 begin
   with Installer do
 {$include fpmkunit/fpmake.pp}
@@ -192,7 +192,7 @@ end;
 
 {$include fppkg/fpmake.pp}
 
-procedure add_fv;
+procedure add_fv(const ADirectory: string);
 begin
   with Installer do
 {$include fv/fpmake.pp}
@@ -200,475 +200,475 @@ end;
 
 {$include gdbint/fpmake.pp}
 
-procedure add_gdbm;
+procedure add_gdbm(const ADirectory: string);
 begin
   with Installer do
 {$include gdbm/fpmake.pp}
 end;
 
-procedure add_ggi;
+procedure add_ggi(const ADirectory: string);
 begin
   with Installer do
 {$include ggi/fpmake.pp}
 end;
 
-procedure add_gmp;
+procedure add_gmp(const ADirectory: string);
 begin
   with Installer do
 {$include gmp/fpmake.pp}
 end;
 
-procedure add_gnome1;
+procedure add_gnome1(const ADirectory: string);
 begin
   with Installer do
 {$include gnome1/fpmake.pp}
 end;
 
-procedure add_graph;
+procedure add_graph(const ADirectory: string);
 begin
   with Installer do
 {$include graph/fpmake.pp}
 end;
 
-procedure add_gtk1;
+procedure add_gtk1(const ADirectory: string);
 begin
   with Installer do
 {$include gtk1/fpmake.pp}
 end;
 
-procedure add_gtk2;
+procedure add_gtk2(const ADirectory: string);
 begin
   with Installer do
 {$include gtk2/fpmake.pp}
 end;
 
-procedure add_hash;
+procedure add_hash(const ADirectory: string);
 begin
   with Installer do
 {$include hash/fpmake.pp}
 end;
 
-procedure add_hermes;
+procedure add_hermes(const ADirectory: string);
 begin
   with Installer do
 {$include hermes/fpmake.pp}
 end;
 
-procedure add_httpd13;
+procedure add_httpd13(const ADirectory: string);
 begin
   with Installer do
 {$include httpd13/fpmake.pp}
 end;
 
-procedure add_httpd20;
+procedure add_httpd20(const ADirectory: string);
 begin
   with Installer do
 {$include httpd20/fpmake.pp}
 end;
 
-procedure add_httpd22;
+procedure add_httpd22(const ADirectory: string);
 begin
   with Installer do
 {$include httpd22/fpmake.pp}
 end;
 
-procedure add_httpd24;
+procedure add_httpd24(const ADirectory: string);
 begin
   with Installer do
 {$include httpd24/fpmake.pp}
 end;
 
-procedure add_ibase;
+procedure add_ibase(const ADirectory: string);
 begin
   with Installer do
 {$include ibase/fpmake.pp}
 end;
 
-procedure add_iconvenc;
+procedure add_iconvenc(const ADirectory: string);
 begin
   with Installer do
 {$include iconvenc/fpmake.pp}
 end;
 
-procedure add_imagemagick;
+procedure add_imagemagick(const ADirectory: string);
 begin
   with Installer do
 {$include imagemagick/fpmake.pp}
 end;
 
-procedure add_imlib;
+procedure add_imlib(const ADirectory: string);
 begin
   with Installer do
 {$include imlib/fpmake.pp}
 end;
 
-procedure add_jni;
+procedure add_jni(const ADirectory: string);
 begin
   with Installer do
 {$include jni/fpmake.pp}
 end;
 
-procedure add_ldap;
+procedure add_ldap(const ADirectory: string);
 begin
   with Installer do
 {$include ldap/fpmake.pp}
 end;
 
-procedure add_libc;
+procedure add_libc(const ADirectory: string);
 begin
   with Installer do
 {$include libc/fpmake.pp}
 end;
 
-procedure add_libcurl;
+procedure add_libcurl(const ADirectory: string);
 begin
   with Installer do
 {$include libcurl/fpmake.pp}
 end;
 
-procedure add_libgbafpc;
+procedure add_libgbafpc(const ADirectory: string);
 begin
   with Installer do
 {$include libgbafpc/fpmake.pp}
 end;
 
-procedure add_libgd;
+procedure add_libgd(const ADirectory: string);
 begin
   with Installer do
 {$include libgd/fpmake.pp}
 end;
 
-procedure add_libndsfpc;
+procedure add_libndsfpc(const ADirectory: string);
 begin
   with Installer do
 {$include libndsfpc/fpmake.pp}
 end;
 
-procedure add_libogcfpc;
+procedure add_libogcfpc(const ADirectory: string);
 begin
   with Installer do
 {$include libogcfpc/fpmake.pp}
 end;
 
-procedure add_libpng;
+procedure add_libpng(const ADirectory: string);
 begin
   with Installer do
 {$include libpng/fpmake.pp}
 end;
 
-procedure add_librsvg;
+procedure add_librsvg(const ADirectory: string);
 begin
   with Installer do
 {$include librsvg/fpmake.pp}
 end;
 
-procedure add_libsee;
+procedure add_libsee(const ADirectory: string);
 begin
   with Installer do
 {$include libsee/fpmake.pp}
 end;
 
-procedure add_libtar;
+procedure add_libtar(const ADirectory: string);
 begin
   with Installer do
 {$include libtar/fpmake.pp}
 end;
 
-procedure add_libvlc;
+procedure add_libvlc(const ADirectory: string);
 begin
   with Installer do
 {$include libvlc/fpmake.pp}
 end;
 
-procedure add_libxml;
+procedure add_libxml(const ADirectory: string);
 begin
   with Installer do
 {$include libxml/fpmake.pp}
 end;
 
-procedure add_lua;
+procedure add_lua(const ADirectory: string);
 begin
   with Installer do
 {$include lua/fpmake.pp}
 end;
 
-procedure add_mad;
+procedure add_mad(const ADirectory: string);
 begin
   with Installer do
 {$include mad/fpmake.pp}
 end;
 
-procedure add_modplug;
+procedure add_modplug(const ADirectory: string);
 begin
   with Installer do
 {$include modplug/fpmake.pp}
 end;
 
-procedure add_mysql;
+procedure add_mysql(const ADirectory: string);
 begin
   with Installer do
 {$include mysql/fpmake.pp}
 end;
 
-procedure add_ncurses;
+procedure add_ncurses(const ADirectory: string);
 begin
   with Installer do
 {$include ncurses/fpmake.pp}
 end;
 
-procedure add_newt;
+procedure add_newt(const ADirectory: string);
 begin
   with Installer do
 {$include newt/fpmake.pp}
 end;
 
-procedure add_numlib;
+procedure add_numlib(const ADirectory: string);
 begin
   with Installer do
 {$include numlib/fpmake.pp}
 end;
 
-procedure add_nvapi;
+procedure add_nvapi(const ADirectory: string);
 begin
   with Installer do
 {$include nvapi/fpmake.pp}
 end;
 
-procedure add_objcrtl;
+procedure add_objcrtl(const ADirectory: string);
 begin
   with Installer do
 {$include objcrtl/fpmake.pp}
 end;
 
-procedure add_odbc;
+procedure add_odbc(const ADirectory: string);
 begin
   with Installer do
 {$include odbc/fpmake.pp}
 end;
 
-procedure add_oggvorbis;
+procedure add_oggvorbis(const ADirectory: string);
 begin
   with Installer do
 {$include oggvorbis/fpmake.pp}
 end;
 
-procedure add_openal;
+procedure add_openal(const ADirectory: string);
 begin
   with Installer do
 {$include openal/fpmake.pp}
 end;
 
-procedure add_opencl;
+procedure add_opencl(const ADirectory: string);
 begin
   with Installer do
 {$include opencl/fpmake.pp}
 end;
 
-procedure add_opengles;
+procedure add_opengl(const ADirectory: string);
 begin
   with Installer do
-{$include opengles/fpmake.pp}
+{$include opengl/fpmake.pp}
 end;
 
-procedure add_opengl;
+procedure add_opengles(const ADirectory: string);
 begin
   with Installer do
-{$include opengl/fpmake.pp}
+{$include opengles/fpmake.pp}
 end;
 
-procedure add_openssl;
+procedure add_openssl(const ADirectory: string);
 begin
   with Installer do
 {$include openssl/fpmake.pp}
 end;
 
-procedure add_oracle;
+procedure add_oracle(const ADirectory: string);
 begin
   with Installer do
 {$include oracle/fpmake.pp}
 end;
 
-procedure add_os2units;
+procedure add_os2units(const ADirectory: string);
 begin
   with Installer do
 {$include os2units/fpmake.pp}
 end;
 
-procedure add_palmunits;
+procedure add_palmunits(const ADirectory: string);
 begin
   with Installer do
 {$include palmunits/fpmake.pp}
 end;
 
-procedure add_pasjpeg;
+procedure add_pasjpeg(const ADirectory: string);
 begin
   with Installer do
 {$include pasjpeg/fpmake.pp}
 end;
 
-procedure add_paszlib;
+procedure add_paszlib(const ADirectory: string);
 begin
   with Installer do
 {$include paszlib/fpmake.pp}
 end;
 
-procedure add_pcap;
+procedure add_pcap(const ADirectory: string);
 begin
   with Installer do
 {$include pcap/fpmake.pp}
 end;
 
-procedure add_postgres;
+procedure add_postgres(const ADirectory: string);
 begin
   with Installer do
 {$include postgres/fpmake.pp}
 end;
 
-procedure add_proj4;
+procedure add_proj4(const ADirectory: string);
 begin
   with Installer do
 {$include proj4/fpmake.pp}
 end;
 
-procedure add_ptc;
+procedure add_ptc(const ADirectory: string);
 begin
   with Installer do
 {$include ptc/fpmake.pp}
 end;
 
-procedure add_pthreads;
+procedure add_pthreads(const ADirectory: string);
 begin
   with Installer do
 {$include pthreads/fpmake.pp}
 end;
 
-procedure add_pxlib;
+procedure add_pxlib(const ADirectory: string);
 begin
   with Installer do
 {$include pxlib/fpmake.pp}
 end;
 
-procedure add_regexpr;
+procedure add_regexpr(const ADirectory: string);
 begin
   with Installer do
 {$include regexpr/fpmake.pp}
 end;
 
-procedure add_rexx;
+procedure add_rexx(const ADirectory: string);
 begin
   with Installer do
 {$include rexx/fpmake.pp}
 end;
 
-procedure add_sdl;
+procedure add_sdl(const ADirectory: string);
 begin
   with Installer do
 {$include sdl/fpmake.pp}
 end;
 
-procedure add_sqlite;
+procedure add_sqlite(const ADirectory: string);
 begin
   with Installer do
 {$include sqlite/fpmake.pp}
 end;
 
-procedure add_svgalib;
+procedure add_svgalib(const ADirectory: string);
 begin
   with Installer do
 {$include svgalib/fpmake.pp}
 end;
 
-procedure add_symbolic;
+procedure add_symbolic(const ADirectory: string);
 begin
   with Installer do
 {$include symbolic/fpmake.pp}
 end;
 
-procedure add_syslog;
+procedure add_syslog(const ADirectory: string);
 begin
   with Installer do
 {$include syslog/fpmake.pp}
 end;
 
-procedure add_tcl;
+procedure add_tcl(const ADirectory: string);
 begin
   with Installer do
 {$include tcl/fpmake.pp}
 end;
 
-procedure add_univint;
+procedure add_univint(const ADirectory: string);
 begin
   with Installer do
 {$include univint/fpmake.pp}
 end;
 
-procedure add_unixutil;
+procedure add_unixutil(const ADirectory: string);
 begin
   with Installer do
 {$include unixutil/fpmake.pp}
 end;
 
-procedure add_unzip;
+procedure add_unzip(const ADirectory: string);
 begin
   with Installer do
 {$include unzip/fpmake.pp}
 end;
 
-procedure add_users;
+procedure add_users(const ADirectory: string);
 begin
   with Installer do
 {$include users/fpmake.pp}
 end;
 
-procedure add_utmp;
+procedure add_utmp(const ADirectory: string);
 begin
   with Installer do
 {$include utmp/fpmake.pp}
 end;
 
-procedure add_uuid;
+procedure add_uuid(const ADirectory: string);
 begin
   with Installer do
 {$include uuid/fpmake.pp}
 end;
 
-procedure add_winceunits;
+procedure add_winceunits(const ADirectory: string);
 begin
   with Installer do
 {$include winceunits/fpmake.pp}
 end;
 
-procedure add_winunits_base;
+procedure add_winunits_base(const ADirectory: string);
 begin
   with Installer do
 {$include winunits-base/fpmake.pp}
 end;
 
-procedure add_winunits_jedi;
+procedure add_winunits_jedi(const ADirectory: string);
 begin
   with Installer do
 {$include winunits-jedi/fpmake.pp}
 end;
 
-procedure add_x11;
+procedure add_x11(const ADirectory: string);
 begin
   with Installer do
 {$include x11/fpmake.pp}
 end;
 
-procedure add_xforms;
+procedure add_xforms(const ADirectory: string);
 begin
   with Installer do
 {$include xforms/fpmake.pp}
 end;
 
-procedure add_zlib;
+procedure add_zlib(const ADirectory: string);
 begin
   with Installer do
 {$include zlib/fpmake.pp}
 end;
 
-procedure add_zorba;
+procedure add_zorba(const ADirectory: string);
 begin
   with Installer do
 {$include zorba/fpmake.pp}

packages/fpmkunit/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fpmkunit');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fpmkunit';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Description:='Free Pascal Make Tool';

packages/fppkg/fpmake.pp

@@ -5,7 +5,7 @@ program fpmake;
 uses fpmkunit, sysutils;
 {$endif ALLPACKAGES}
 
-procedure add_fppkg;
+procedure add_fppkg(const ADirectory: string);
 
 const
   TargetsWithWGet = [linux,beos,haiku,freebsd,netbsd,openbsd,darwin,iphonesim,solaris,win32,win64,wince,aix];
@@ -23,9 +23,7 @@ begin
     begin
 
     P:=AddPackage('fppkg');
-{$ifdef ALLPACKAGES}
-    P.Directory:='fppkg';
-{$endif ALLPACKAGES}
+    P.Directory:=ADirectory;
 
     P.Version:='2.7.1';
     P.Dependencies.Add('fcl-base');
@@ -91,7 +89,7 @@ end;
 
 {$ifndef ALLPACKAGES}
 begin
-  add_fppkg;
+  add_fppkg('');
   Installer.Run;
 end.
 {$endif ALLPACKAGES}

packages/fv/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('fv');
 {$ifdef ALLPACKAGES}
-    P.Directory:='fv';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Leon De Boer and Pierre Mueller';

packages/gdbint/fpmake.pp

@@ -133,7 +133,7 @@ begin
   end;
 end;
 
-procedure add_gdbint;
+procedure add_gdbint(const ADirectory: string);
 
 Var
   P : TPackage;
@@ -142,9 +142,7 @@ begin
   With Installer do
     begin
     P:=AddPackage('gdbint');
-{$ifdef ALLPACKAGES}
-    P.Directory:='gdbint';
-{$endif ALLPACKAGES}
+    P.Directory:=ADirectory;
     P.Version:='2.7.1';
     P.Author := 'Library : Cygnus, header: Peter Vreman';
     P.License := 'Library: GPL2 or later, header: LGPL with modification, ';
@@ -187,7 +185,7 @@ end;
 
 {$ifndef ALLPACKAGES}
 begin
-  add_gdbint;
+  add_gdbint('');
   Installer.Run;
 end.
 {$endif ALLPACKAGES}

packages/gdbm/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('gdbm');
 {$ifdef ALLPACKAGES}
-    P.Directory:='gdbm';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: GNU, header: Michael van Canneyt';

packages/ggi/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('ggi');
 {$ifdef ALLPACKAGES}
-    P.Directory:='ggi';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: ?, header: Sebastian Guenther';

packages/gmp/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('gmp');
 {$ifdef ALLPACKAGES}
-    P.Directory:='gmp';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/gnome1/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('gnome1');
 {$ifdef ALLPACKAGES}
-    P.Directory:='gnome1';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes:=AllUnixOSes-[darwin,iphonesim,Android];

packages/graph/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('graph');
 {$ifdef ALLPACKAGES}
-    P.Directory:='graph';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'FPC team';

packages/gtk1/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('gtk1');
 {$ifdef ALLPACKAGES}
-    P.Directory:='gtk1';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: Peter Mattis, Spencer Kimball and Josh MacDonald, header: Peter Vreman';

packages/gtk2/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('gtk2');
 {$ifdef ALLPACKAGES}
-    P.Directory:='gtk2';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SupportBuildModes := [bmOneByOne];

packages/hash/fpmake.pp

@@ -14,7 +14,7 @@ begin
     P:=AddPackage('hash');
 
 {$ifdef ALLPACKAGES}
-    P.Directory:='hash';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
 
     P.Author := 'Free Pascal development team, Mark Adler, Jacques Nomssi Nzali';

packages/hermes/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('hermes');
 {$ifdef ALLPACKAGES}
-    P.Directory:='hermes';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/httpd13/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('httpd13');
 {$ifdef ALLPACKAGES}
-    P.Directory:='httpd13';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho';

packages/httpd20/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('httpd20');
 {$ifdef ALLPACKAGES}
-    P.Directory:='httpd20';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho';

packages/httpd22/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('httpd22');
 {$ifdef ALLPACKAGES}
-    P.Directory:='httpd22';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho';

packages/httpd24/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('httpd24');
 {$ifdef ALLPACKAGES}
-    P.Directory:='httpd24';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: Apache Foundation, header: Felipe Monteiro de Carvalho';

packages/ibase/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('ibase');
 {$ifdef ALLPACKAGES}
-    P.Directory:='ibase';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: (Codegear?), header: ?';

packages/iconvenc/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('iconvenc');
 {$ifdef ALLPACKAGES}
-    P.Directory:='iconvenc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Marco van de Voort';

packages/imagemagick/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('imagemagick');
 {$ifdef ALLPACKAGES}
-    P.Directory:='imagemagick';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/imlib/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('imlib');
 {$ifdef ALLPACKAGES}
-    P.Directory:='imlib';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/jni/fpmake.pp

@@ -15,7 +15,7 @@ begin
 
     P:=AddPackage('jni');
 {$ifdef ALLPACKAGES}
-    P.Directory:='jni';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
 
     P.Version:='2.7.1';

packages/ldap/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('ldap');
 {$ifdef ALLPACKAGES}
-    P.Directory:='ldap';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: Howard Chu, Pierangelo Masarati and Kurt Zeilenga, header: Ivo Steinmann';

packages/libc/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libc');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/libcurl/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libcurl');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libcurl';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/libgbafpc/fpmake.pp

@@ -16,7 +16,7 @@ begin
     P.OSes:=[gba];
     P.CPUs:=[arm];
 {$ifdef ALLPACKAGES}
-    P.Directory:='libgbafpc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: libgba and maxmod from devkitARM; headers: Francesco Lombardi';

packages/libgd/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libgd');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libgd';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/libndsfpc/fpmake.pp

@@ -16,7 +16,7 @@ begin
     P.OSes:=[nds];
     P.CPUs:=[arm];
 {$ifdef ALLPACKAGES}
-    P.Directory:='libndsfpc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Library: libnds, dswifi, maxmod and gl2d from devkitARM; headers: Francesco Lombardi';

packages/libogcfpc/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libogcfpc');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libogcfpc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/libpng/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libpng');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libpng';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Dependencies.Add('zlib');

packages/librsvg/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('rsvg');
 {$ifdef ALLPACKAGES}
-    P.Directory:='librsvg';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.OSes := [beos,haiku,freebsd,netbsd,openbsd,linux,win32,aix];
     // Do not build x11 on iPhone (=arm-darwin)

packages/libsee/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libsee');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libsee';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'David Leonard';

packages/libtar/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libtar');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libtar';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
 

packages/libvlc/fpmake.pp

@@ -13,7 +13,7 @@ begin
 {$endif ALLPACKAGES}
     P:=AddPackage('libvlc');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libvlc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.OSes := [win32, win64, linux, freebsd];
     P.Dependencies.Add('fcl-base');

packages/libxml/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('libxml2');
 {$ifdef ALLPACKAGES}
-    P.Directory:='libxml';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [freebsd,linux,win32];

packages/lua/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('lua');
 {$ifdef ALLPACKAGES}
-    P.Directory:='lua';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/mad/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('mad');
 {$ifdef ALLPACKAGES}
-    P.Directory:='mad';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [linux,win32,win64];

packages/modplug/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('modplug');
 {$ifdef ALLPACKAGES}
-    P.Directory:='modplug';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [linux];

packages/mysql/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('mysql');
 {$ifdef ALLPACKAGES}
-    P.Directory:='mysql';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/ncurses/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('ncurses');
 {$ifdef ALLPACKAGES}
-    P.Directory:='ncurses';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [beos,haiku,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,linux,aix];

packages/newt/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('newt');
 {$ifdef ALLPACKAGES}
-    P.Directory:='newt';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/numlib/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('numlib');
 {$ifdef ALLPACKAGES}
-    P.Directory:='numlib';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/nvapi/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('nvapi');
 {$ifdef ALLPACKAGES}
-    P.Directory:='nvapi';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'NVidia, Andreas Hausladen, Dmitry "skalogryz" Boyarintsev';

packages/objcrtl/fpmake.pp

@@ -12,7 +12,7 @@ begin
 {$endif ALLPACKAGES}
     P:=AddPackage('objcrtl');
 {$ifdef ALLPACKAGES}
-    P.Directory:='objcrtl';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes:=[darwin,iphonesim];

packages/odbc/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('odbc');
 {$ifdef ALLPACKAGES}
-    P.Directory:='odbc';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := AllUnixOSes+AllWindowsOSes-[qnx];

packages/oggvorbis/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('oggvorbis');
 {$ifdef ALLPACKAGES}
-    P.Directory:='oggvorbis';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/openal/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('openal');
 {$ifdef ALLPACKAGES}
-    P.Directory:='openal';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     if Defaults.CPU = i386 then

packages/opencl/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('opencl');
 {$ifdef ALLPACKAGES}
-    P.Directory:='opencl';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := ' Dmitry "skalogryz" Boyarintsev; Kronos group';

packages/opengl/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('opengl');
 {$ifdef ALLPACKAGES}
-    P.Directory:='opengl';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes:=AllUnixOSes+[Win32,Win64]-[Android];

packages/opengles/fpmake.pp

@@ -15,7 +15,7 @@ begin
 
     P:=AddPackage('opengles');
 {$ifdef ALLPACKAGES}
-    P.Directory:='opengles';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.Author := 'Free Pascal Development team';

packages/openssl/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('openssl');
 {$ifdef ALLPACKAGES}
-    P.Directory:='openssl';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/oracle/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('oracle');
 {$ifdef ALLPACKAGES}
-    P.Directory:='oracle';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/os2units/fpmake.pp

@@ -13,7 +13,7 @@ begin
 
     P:=AddPackage('os2units');
 {$ifdef ALLPACKAGES}
-    P.Directory:='os2units';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [OS2,emx];

packages/palmunits/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('palmunits');
 {$ifdef ALLPACKAGES}
-    P.Directory:='palmunits';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := [palmos];

packages/pasjpeg/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('pasjpeg');
 {$ifdef ALLPACKAGES}
-    P.Directory:='pasjpeg';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes:=P.OSes-[embedded];

packages/paszlib/fpmake.pp

@@ -15,7 +15,7 @@ begin
 
     P:=AddPackage('paszlib');
 {$ifdef ALLPACKAGES}
-    P.Directory:='paszlib';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.OSes := P.OSes - [embedded,nativent];

packages/pcap/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('pcap');
 {$ifdef ALLPACKAGES}
-    P.Directory:='pcap';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/postgres/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('postgres');
 {$ifdef ALLPACKAGES}
-    P.Directory:='postgres';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');

packages/proj4/fpmake.pp

@@ -14,7 +14,7 @@ begin
 
     P:=AddPackage('proj4');
 {$ifdef ALLPACKAGES}
-    P.Directory:='proj4';
+    P.Directory:=ADirectory;
 {$endif ALLPACKAGES}
     P.Version:='2.7.1';
     P.SourcePath.Add('src');