Browse Source

* Fixed filepaths for fpmake archive-command

git-svn-id: trunk@29021 -
joost 10 years ago
parent
commit
972548139e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      packages/fpmkunit/src/fpmkunit.pp

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

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