Browse Source

fpmake build: fixed paths in installed pas2js.cfg

mattias 1 year ago
parent
commit
cccbb9891d
1 changed files with 3 additions and 2 deletions
  1. 3 2
      fpmake.pp

+ 3 - 2
fpmake.pp

@@ -179,7 +179,6 @@ end;
 Var
 Var
   P : TPackage;
   P : TPackage;
   UnitDir,DemoDir,BD, TmpCfg, TmpCfg2: String;
   UnitDir,DemoDir,BD, TmpCfg, TmpCfg2: String;
-  T: TTarget;
   FPCSrcDir, Pas2jsOFilename, RTLJSFilename: String;
   FPCSrcDir, Pas2jsOFilename, RTLJSFilename: String;
 
 
 begin
 begin
@@ -293,11 +292,13 @@ begin
       UnitDir:=ExcludeTrailingPathDelimiter(ExtractFilePath(UnitDir));
       UnitDir:=ExcludeTrailingPathDelimiter(ExtractFilePath(UnitDir));
       UnitDir:=ExtractFilePath(UnitDir);
       UnitDir:=ExtractFilePath(UnitDir);
       UnitDir:=UnitDir+'pas2js'+PathDelim;
       UnitDir:=UnitDir+'pas2js'+PathDelim;
+      RTLJSFilename:=ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir),
+                            UnitDir+'rtl'+PathDelim);
       // Config file
       // Config file
       // Create config file
       // Create config file
       CreateConfigFile(TmpCfg,
       CreateConfigFile(TmpCfg,
         ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir),
         ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir),
-                            IncludeTrailingPathDelimiter(UnitDir)));
+                            UnitDir),RTLJSFilename);
       CreateNamespacedConfigFile(TmpCfg2);
       CreateNamespacedConfigFile(TmpCfg2);
       P.InstallFiles.Add(TmpCfg,Defaults.BinInstallDir);
       P.InstallFiles.Add(TmpCfg,Defaults.BinInstallDir);
       P.InstallFiles.Add(TmpCfg2,Defaults.BinInstallDir);
       P.InstallFiles.Add(TmpCfg2,Defaults.BinInstallDir);