Fix version info for Leash.exe

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
(cherry picked from commit 25494149ab80332392db396fecaf3e1cea9c1cba)

ticket: 7235
status: resolved

diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index 3f98c951b12fb5a51f6cc77a57d8fb601cad3b40..eb8a566ae2785bb97669f8fc492c8d1e93e42825 100644 (file)
--- a/src/windows/leash/Makefile.in
+++ b/src/windows/leash/Makefile.in
@@ -90,7 +90,7 @@ $(OUTPRE)$(EXE_NAME).exe: $(OBJS) $(XOBJS) $(LIBS)
          $(LIBS) $(SYSLIBS) $(BUILDTOP)\util\wshelper\$(OUTPRE)$(WSHELPER).lib \
          ../lib/$(OUTPRE)libwin.lib atl.lib $(MFCLIB) $(SCLIB)
 
-$(RESFILE): ..\version.rc Leash.rc
+$(RESFILE): Leash.rc res/Leash.rc2 ver.rc ../version.rc ../kerberos.ver
 
 clean::
        if exist $(OUTPRE)*.exe del $(OUTPRE)*.exe

diff --git a/src/windows/leash/res/Leash.rc2 b/src/windows/leash/res/Leash.rc2
index e5dbf29b827ef7289c32f565a8b0de925bdbea84..0a5dcb613e3f025fd21b1b25459be41e076ab1c0 100644 (file)
--- a/src/windows/leash/res/Leash.rc2
+++ b/src/windows/leash/res/Leash.rc2
@@ -9,6 +9,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
 // Add manually edited resources here...
-#include "ver.rc"
+#include "..\ver.rc"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/src/windows/leash/ver.rc b/src/windows/leash/ver.rc
index b93fcc46a3ac5029dcc971973e6c6d0ecbfef751..09575d474dbfe0a246a00ce80b04fe5ff38c2919 100644 (file)
--- a/src/windows/leash/ver.rc
+++ b/src/windows/leash/ver.rc
@@ -1,3 +1,3 @@
 #define VER_FILEDESCRIPTION_STR        "Leash Application"
 
-#include <kerberos.ver>
+#include "..\version.rc"