From cdb24acd8fe82fc1ce1ce8213cb97dcc29855aef Mon Sep 17 00:00:00 2001
From: Frank Li <lznuaa@gmail.com>
Date: Wed, 14 Jan 2009 21:20:08 +0800
Subject: [PATCH] Add TortoiseGitBlame as blame program

Signed-off-by: Frank Li <lznuaa@gmail.com>
---
 src/TortoiseGitBlame/TortoiseGitBlame.vcproj | 8 ++++----
 src/TortoiseGitSetup/StructureFragment.wxi   | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
index 0a7ec49..46e2be4 100644
--- a/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
+++ b/src/TortoiseGitBlame/TortoiseGitBlame.vcproj
@@ -18,8 +18,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			CharacterSet="1"
@@ -99,8 +99,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory="..\..\bin\$(ConfigurationName)\bin"
+			IntermediateDirectory="..\..\obj\TortoiseGitBlame\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="2"
 			CharacterSet="1"
diff --git a/src/TortoiseGitSetup/StructureFragment.wxi b/src/TortoiseGitSetup/StructureFragment.wxi
index 95a5707..0c4da7b 100644
--- a/src/TortoiseGitSetup/StructureFragment.wxi
+++ b/src/TortoiseGitSetup/StructureFragment.wxi
@@ -306,9 +306,9 @@
             </Component>
 
             <Component Id="C__TortoiseBlame" Guid="$(var.GuidTortoiseBlame)" Win64="$(var.Win64YesNo)">
-              <!--
-              <File Id="F__TortoiseBlame" ShortName="TBLAME.EXE" Name="TortoiseBlame.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseBlame.exe" KeyPath="yes" />
-             --> 
+             
+              <File Id="F__TortoiseBlame" ShortName="TBLAME.EXE" Name="TortoiseGitBlame.exe" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\TortoiseGitBlame.exe" KeyPath="yes" />
+          
               <File Id="F__SciLexer" ShortName="SCILEX.DLL" Name="SciLexer.dll" DiskId="1" Source="..\..\bin\$(var.ReleasePath)\bin\SciLexer.dll" />
            </Component>
             
-- 
2.11.0