fpmake build: fixed paths in installed pas2js.cfg

This commit is contained in:
mattias 2024-03-19 10:52:49 +01:00
parent 0273024739
commit cccbb9891d

View File

@ -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);