* Add path of (user specific) packages installed with fppkg to fpc.cfg

git-svn-id: trunk@17116 -

utils/fpcmkcfg/fpc.cft

@@ -127,6 +127,9 @@
 -Fu%basepath%/units/$FPCTARGET/*
 -Fu%basepath%/units/$FPCTARGET/rtl
 
+# searchpath for fppkg user-specific packages
+-Fu%localbasepath%/units/$FPCTARGET/*
+
 #IFDEF FPCAPACHE_1_13
 -Fu%basepath%/units/$FPCTARGET/httpd13/
 #ELSE

utils/fpcmkcfg/fpccfg.inc

@@ -140,20 +140,23 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '-Fu%basepath%/units/$FPCTARGET/*'#010+
   '-Fu%basepath%/units/$FPCTARGET/rtl',#010+
   #010+
+  '# searchpath for fppkg user-specific packages'#010+
+  '-Fu%localbasepath%/units/$FPCTARGET/*'#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/$FPCTARGET/httpd22'#010+
+  '-Fu%basepath%/units','/$FPCTARGET/httpd22'#010+
   '#ENDIF'#010+
   '#ENDIF'#010+
   #010+
   '# path to the gcclib'#010+
   '%gcclibpath%'#010+
   #010+
-  '# searchpath fo','r libraries'#010+
+  '# searchpath for libraries'#010+
   '#-Fl%basepath%/lib'#010+
   '#-Fl/lib;/usr/lib'#010+
   #010+
@@ -162,11 +165,11 @@ const DefaultConfig : array[0..23,1..240] of char=(
   #010+
   '%NEEDCROSSBINUTILSIFDEF%'#010+
   #010+
-  '# binutils prefix for cross compiling'#010+
+  '# binutils prefix for cros','s compiling'#010+
   '#IFDEF FPC_CROSSCOMPILING'#010+
   '#IFDEF NEEDCROSSBINUTILS'#010+
   '  -XP$FPCTARGET-'#010+
-  '#ENDI','F'#010+
+  '#ENDIF'#010+
   '#ENDIF'#010+
   #010+
   #010+
@@ -177,13 +180,13 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# generate always debugging information for GDB (slows down the compil'+
   'ing'#010+
   '# process)'#010+
-  '#      -gc        generate checks for pointers'#010+
+  '#      -gc      ','  generate checks for pointers'#010+
   '#      -gd        use dbx'#010+
   '#      -gg        use gsym'#010+
-  '#','      -gh        use heap trace unit (for memory leak debugging)'#010+
+  '#      -gh        use heap trace unit (for memory leak debugging)'#010+
   '#      -gl        use line info unit to show more info for backtraces'#010+
-  '#      -gv        generates programs tracable with valgrind'#010+
-  '#      -gw        generate dwarf debugging in','fo'#010+
+  '#      -gv        ge','nerates programs tracable with valgrind'#010+
+  '#      -gw        generate dwarf debugging info'#010+
   '#'#010+
   '# Enable debuginfo and use the line info unit by default'#010+
   '#-gl'#010+
@@ -191,7 +194,7 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# always pass an option to the linker'#010+
   '#-k-s'#010+
   #010+
-  '# Always strip debuginfo from the executable'#010+
+  '# Always strip debuginfo from the executab','le'#010+
   '-Xs'#010+
   #010+
   #010+
@@ -199,26 +202,26 @@ const DefaultConfig : array[0..23,1..240] of char=(
   '# Miscellaneous'#010+
   '# -------------'#010+
   #010+
-  '# Write always a nice FPC l','ogo ;)'#010+
+  '# Write always a nice FPC logo ;)'#010+
   '-l'#010+
   #010+
   '# Verbosity'#010+
   '#      e : Show errors (default)       d : Show debug info'#010+
   '#      w : Show warnings               u : Show unit info'#010+
-  '#      n : Show notes                  t : Show tried/used files'#010+
-  '#      h : Show hints              ','    m : Show defined macros'#010+
+  '#      n : Show',' notes                  t : Show tried/used files'#010+
+  '#      h : Show hints                  m : Show defined macros'#010+
   '#      i : Show general info           p : Show compiled procedures'#010+
-  '#      l : Show linenumbers            c : Show conditionals'#010+
+  '#      l : Show linenumbers            c : Show conditional','s'#010+
   '#      a : Show everything             0 : Show nothing (except errors'+
   ')'#010+
-  '#      b : ','Show all procedure          r : Rhide/GCC compatibility m'+
-  'ode'#010+
+  '#      b : Show all procedure          r : Rhide/GCC compatibility mod'+
+  'e'#010+
   '#          declarations if an error    x : Executable info (Win32 only'+
   ')'#010+
   '#          occurs'#010+
   '#'#010+
-  '# Display Info, Warnings, Notes and Hints'#010+
+  '# ','Display Info, Warnings, Notes and Hints'#010+
   '-viwn'#010+
-  '# If you don'#039't want so much verbosity u','se'#010+
+  '# If you don'#039't want so much verbosity use'#010+
   '#-vw'#010
 );

utils/fpcmkcfg/fpcmkcfg.pp

@@ -92,6 +92,17 @@ begin
 {$ENDIF Unix}
 end;
 
+function GetDefaultLocalBasepath: string;
+
+begin
+{$IFDEF Unix}
+  result := '~/.fppkg'+PathDelim+'lib'+PathDelim+'fpc'+PathDelim+'$fpcversion';
+{$ELSE Unix}
+  result := '$LOCAL_APPDATA'+PathDelim+'FreePascal'+PathDelim+'fppkg';
+{$ENDIF Unix}
+end;
+
+
 function GetDefaultNeedCrossBinutilsIfdef: string;
 
 begin
@@ -251,6 +262,7 @@ begin
   TemplateParser.Values['BUILDTIME'] := TimeToStr(Time);
 
   TemplateParser.Values['LOCALREPOSITORY'] := GetDefaultLocalRepository;
+  TemplateParser.Values['LOCALBASEPATH'] := GetDefaultLocalBasepath;
   TemplateParser.Values['NEEDCROSSBINUTILSIFDEF'] := GetDefaultNeedCrossBinutilsIfdef;
   TemplateParser.Values['GCCLIBPATH'] := GetDefaultGCCDIR;