From cccbb9891da4fad39f84552678acc17ca58e41fd Mon Sep 17 00:00:00 2001 From: mattias Date: Tue, 19 Mar 2024 10:52:49 +0100 Subject: [PATCH] fpmake build: fixed paths in installed pas2js.cfg --- fpmake.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fpmake.pp b/fpmake.pp index aa361d4..e44ddbc 100644 --- a/fpmake.pp +++ b/fpmake.pp @@ -179,7 +179,6 @@ end; Var P : TPackage; UnitDir,DemoDir,BD, TmpCfg, TmpCfg2: String; - T: TTarget; FPCSrcDir, Pas2jsOFilename, RTLJSFilename: String; begin @@ -293,11 +292,13 @@ begin UnitDir:=ExcludeTrailingPathDelimiter(ExtractFilePath(UnitDir)); UnitDir:=ExtractFilePath(UnitDir); UnitDir:=UnitDir+'pas2js'+PathDelim; + RTLJSFilename:=ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir), + UnitDir+'rtl'+PathDelim); // Config file // Create config file CreateConfigFile(TmpCfg, ExtractRelativePath(IncludeTrailingPathDelimiter(Defaults.BinInstallDir), - IncludeTrailingPathDelimiter(UnitDir))); + UnitDir),RTLJSFilename); CreateNamespacedConfigFile(TmpCfg2); P.InstallFiles.Add(TmpCfg,Defaults.BinInstallDir); P.InstallFiles.Add(TmpCfg2,Defaults.BinInstallDir);