Browse Source

* Fixed building packages in directories wich do not match the package-name

git-svn-id: trunk@34636 -
joost 8 years ago
parent
commit
8571e9f82a
1 changed files with 7 additions and 1 deletions
  1. 7 1
      packages/fppkg/src/pkguninstalledsourcesrepository.pp

+ 7 - 1
packages/fppkg/src/pkguninstalledsourcesrepository.pp

@@ -122,6 +122,9 @@ begin
                       end;
                       end;
                     end;
                     end;
                   ARepository.AddPackagesFromManifestFile(AManifestFile);
                   ARepository.AddPackagesFromManifestFile(AManifestFile);
+                  for i := 0 to ARepository.PackageCount -1 do
+                    if ARepository.Packages[i].SourcePath = '' then
+                      ARepository.Packages[i].SourcePath := SR.Name;
                 end
                 end
             end;
             end;
         until FindNext(SR)<>0;
         until FindNext(SR)<>0;
@@ -140,7 +143,10 @@ end;
 
 
 function TFPUninstalledSourcesAvailablePackagesStructure.GetBuildPathDirectory(APackage: TFPPackage): string;
 function TFPUninstalledSourcesAvailablePackagesStructure.GetBuildPathDirectory(APackage: TFPPackage): string;
 begin
 begin
-  Result := FPath+APackage.Name;
+  if APackage.SourcePath<>'' then
+    Result := FPath+APackage.SourcePath
+  else
+    Result := FPath+APackage.Name
 end;
 end;