From ccd3db480296db3f7c63f1e10b45bbc4abb240da Mon Sep 17 00:00:00 2001
From: Manoj Ampalam <manojampalam@live.com>
Date: Wed, 11 May 2016 12:47:46 -0700
Subject: [PATCH] 5-11 C1

---
 contrib/win32/openssh/Win32-OpenSSH.sln |  1 -
 contrib/win32/openssh/ssh-agent.vcxproj | 30 ++++++++++++-------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/contrib/win32/openssh/Win32-OpenSSH.sln b/contrib/win32/openssh/Win32-OpenSSH.sln
index 18d429e..637236d 100644
--- a/contrib/win32/openssh/Win32-OpenSSH.sln
+++ b/contrib/win32/openssh/Win32-OpenSSH.sln
@@ -81,7 +81,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssh-agent", "ssh-agent.vcxproj", "{F6644EC5-D6B6-42A1-828C-75E2977470E0}"
 	ProjectSection(ProjectDependencies) = postProject
 		{05E1115F-8529-46D0-AAAF-52A404CE79A7} = {05E1115F-8529-46D0-AAAF-52A404CE79A7}
-		{8F9D3B74-8D33-448E-9762-26E8DCC6B2F4} = {8F9D3B74-8D33-448E-9762-26E8DCC6B2F4}
 		{DD483F7D-C553-4740-BC1A-903805AD0174} = {DD483F7D-C553-4740-BC1A-903805AD0174}
 		{0D02F0F0-013B-4EE3-906D-86517F3822C0} = {0D02F0F0-013B-4EE3-906D-86517F3822C0}
 		{8660C2FE-9874-432D-B047-E042BB41DBE0} = {8660C2FE-9874-432D-B047-E042BB41DBE0}
diff --git a/contrib/win32/openssh/ssh-agent.vcxproj b/contrib/win32/openssh/ssh-agent.vcxproj
index ae8edba..efc9863 100644
--- a/contrib/win32/openssh/ssh-agent.vcxproj
+++ b/contrib/win32/openssh/ssh-agent.vcxproj
@@ -194,23 +194,23 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\servconf.h" />
-    <ClInclude Include="..\ssh-pubkey\ssh-pubkeydefs.h" />
-    <ClInclude Include="..\win32compat\ssh-agent\agent-request.h" />
-    <ClInclude Include="..\win32compat\ssh-agent\agent.h" />
+    <ClInclude Include="$(OpenSSH-Src-Path)\servconf.h" />
+    <ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\ssh-pubkey\ssh-pubkeydefs.h" />
+    <ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\agent-request.h" />
+    <ClInclude Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\agent.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\auth.c" />
-    <ClCompile Include="..\..\..\groupaccess.c" />
-    <ClCompile Include="..\..\..\roaming_dummy.c" />
-    <ClCompile Include="..\..\..\servconf.c" />
-    <ClCompile Include="..\win32compat\ssh-agent\agent-main.c" />
-    <ClCompile Include="..\win32compat\ssh-agent\agent.c" />
-    <ClCompile Include="..\win32compat\ssh-agent\authagent-request.c" />
-    <ClCompile Include="..\win32compat\ssh-agent\agentconfig.c" />
-    <ClCompile Include="..\win32compat\ssh-agent\connection.c" />
-    <ClCompile Include="..\win32compat\ssh-agent\keyagent-request.c" />
-    <ClCompile Include="..\win32compat\ssh-agent\pubkeyagent-request.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\auth.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\groupaccess.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\roaming_dummy.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\servconf.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\agent-main.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\agent.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\authagent-request.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\agentconfig.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\connection.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\keyagent-request.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)\contrib\win32\win32compat\ssh-agent\pubkeyagent-request.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">