浏览代码

* Fixed filepaths for fpmake archive-command

git-svn-id: trunk@29021 -
joost 11 年之前
父节点
当前提交
972548139e
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      packages/fpmkunit/src/fpmkunit.pp

+ 2 - 2
packages/fpmkunit/src/fpmkunit.pp

@@ -5198,7 +5198,7 @@ begin
     SysArchiveFiles(List,ArchiveFile)
   else
     begin
-      S:=FileListToString(List,'');
+      S:=FileListToString(List,IncludeTrailingPathDelimiter(GPathPrefix));
       SplitCommand(Defaults.Archive,C,O);
       If (O='') then
         O:=ArchiveFile+' '+S
@@ -6803,7 +6803,7 @@ begin
               A:=IncludeTrailingPathDelimiter(A);
             for i := 0 to L.Count-1 do
               begin
-                ZipFile.Entries.AddFileEntry(L[i], A+L[i]);
+                ZipFile.Entries.AddFileEntry(AddPathPrefix(APackage, L[i]), A+L[i]);
               end;
             ZipFile.ZipAllFiles;
           finally