More lib path changes

Author: Edward Thomson

buildpackage.ps1

@@ -9,10 +9,10 @@ $versionSuffix = ""
 if ($pre.IsPresent) { $versionSuffix = "-pre$BuildDate" }
 
 $projectDirectory = Split-Path $MyInvocation.MyCommand.Path
-$x86Directory = Join-Path $projectDirectory "nuget.package\libgit2\windows\x86"
-$x64Directory = Join-Path $projectDirectory "nuget.package\libgit2\windows\amd64"
+$x86Directory = Join-Path $projectDirectory "nuget.package\libgit2\win32\x86"
+$x64Directory = Join-Path $projectDirectory "nuget.package\libgit2\win32\x64"
 $osxDirectory = Join-Path $projectDirectory "nuget.package\libgit2\osx"
-$linuxDirectory = Join-Path $projectDirectory "nuget.package\libgit2\linux\amd64"
+$linuxDirectory = Join-Path $projectDirectory "nuget.package\libgit2\linux\x86_64"
 
 if ( -Not (Test-Path $x86Directory\*.dll) )
 {

download.build.artifacts.and.package.ps1

@@ -116,8 +116,8 @@ Add-Type -assembly "System.Io.Compression.Filesystem"
 [Io.Compression.ZipFile]::ExtractToDirectory("$($osxBins.FullName)", "$($osxBins.FullName).ext")
 
 Write-Host -ForegroundColor "Yellow" "Including non Windows build artifacts"
-Move-Item "$($linuxBins.FullName).ext\libgit2\linux\amd64\*.so" "$($package.FullName).ext\libgit2\linux\amd64"
-Remove-Item "$($package.FullName).ext\libgit2\linux\amd64\addbinaries.here"
+Move-Item "$($linuxBins.FullName).ext\libgit2\linux\x86_64\*.so" "$($package.FullName).ext\libgit2\linux\x86_64"
+Remove-Item "$($package.FullName).ext\libgit2\linux\x86_64\addbinaries.here"
 Move-Item "$($osxBins.FullName).ext\libgit2\osx\*.dylib" "$($package.FullName).ext\libgit2\osx"
 Remove-Item "$($package.FullName).ext\libgit2\osx\addbinaries.here"