Browse Source

* pass --localunitdir and --globalunitdir to fpmake

git-svn-id: trunk@9121 -
peter 18 years ago
parent
commit
c345118331
2 changed files with 312 additions and 294 deletions
  1. 307 294
      utils/fppkg/fpmkunitsrc.inc
  2. 5 0
      utils/fppkg/pkgfpmake.pp

File diff suppressed because it is too large
+ 307 - 294
utils/fppkg/fpmkunitsrc.inc


+ 5 - 0
utils/fppkg/pkgfpmake.pp

@@ -263,6 +263,11 @@ begin
     OOptions:=OOptions+' --baseinstalldir='+Options.GlobalInstallDir
     OOptions:=OOptions+' --baseinstalldir='+Options.GlobalInstallDir
   else
   else
     OOptions:=OOptions+' --baseinstalldir='+Options.LocalInstallDir;
     OOptions:=OOptions+' --baseinstalldir='+Options.LocalInstallDir;
+  if Options.LocalInstallDir<>'' then
+    OOptions:=OOptions+' --localunitdir='+Options.LocalInstallDir+
+        'units'+PathDelim+MakeTargetString(Options.CompilerCPU,Options.CompilerOS);
+  OOptions:=OOptions+' --globalunitdir='+Options.GlobalInstallDir+
+      'units'+PathDelim+MakeTargetString(Options.CompilerCPU,Options.CompilerOS);
   { Run FPMake }
   { Run FPMake }
   FPMakeBin:='fpmake'+ExeExt;
   FPMakeBin:='fpmake'+ExeExt;
   SetCurrentDir(PackageBuildPath);
   SetCurrentDir(PackageBuildPath);

Some files were not shown because too many files changed in this diff