[26856] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix version info for Leash.exe
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu Aug 23 14:50:01 2012
Date: Thu, 23 Aug 2012 14:49:57 -0400
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201208231849.q7NInviX030227@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/25494149ab80332392db396fecaf3e1cea9c1cba
commit 25494149ab80332392db396fecaf3e1cea9c1cba
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Thu Jun 28 14:50:13 2012 -0400
Fix version info for Leash.exe
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7235 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
src/windows/leash/Makefile.in | 2 +-
src/windows/leash/res/Leash.rc2 | 2 +-
src/windows/leash/ver.rc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index 3f98c95..eb8a566 100644
--- 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 e5dbf29..0a5dcb6 100644
--- 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 b93fcc4..09575d4 100644
--- 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"
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
