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 24d31fdd97b0da8a3a718bbca9dbff8865923887..f8c674ac5c3c9452b6e03930b7f500bf53ae6a8f 100644 (file)
--- 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)