From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 18 Sep 2007 07:36:59 +0000 (+0000)
Subject: DEVEL15-windows-afs-config-vista-uac-vs2005-20070918
X-Git-Tag: openafs-devel-1_5_25~10
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=bbb7ec760f66306e88cfb7a7a2433c46fae595f6;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-afs-config-vista-uac-vs2005-20070918


merge the manifests for vs 2005


(cherry picked from commit a47f4bacd8b091a7917ffefe405a6f0f036499d9)
---

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index 24d31fdd9..f8c674ac5 100644
--- a/src/WINNT/client_config/NTMakefile
+++ b/src/WINNT/client_config/NTMakefile
@@ -50,7 +50,7 @@ EXERES = \
 
 AFSDOBJS = \
 	$(OUT)\fs_utils.obj
-	
+
 AFSD= ..\afsd
 
 VCLIBS =\
@@ -109,7 +109,7 @@ $(EXEOBJSc): $$(@B).c
 
 $(EXEFILE) : $(EXEOBJS) $(EXEOBJSc) $(EXERES) $(AFSDOBJS) $(EXELIBS)
 	$(EXEGUILINK) $(VCLIBS)
-!IF ("$(AFS_CL)" == "1400")
+!IF ("$(AFSVER_CL)" == "1400")
         if exist $@.manifest mt.exe -manifest afs_config.exe.manifest $(MANIFEST) -out:$(MANIFEST)
 !ELSE
         $(COPY) afs_config.exe.manifest $(MANIFEST)