windows-client-config-manifest-20090104

LICENSE MIT
FIXES 123889

reverse change from 20081226.  removing the auto-generated manifest
removes the manifest binding to the run time library.  The reason
two manifests are specified is that we are merging them.

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index f0e1247..34a3375 100644 (file)
--- a/src/WINNT/client_config/NTMakefile
+++ b/src/WINNT/client_config/NTMakefile
@@ -110,7 +110,7 @@ $(EXEOBJSc): $$(@B).c
 $(EXEFILE) : $(EXEOBJS) $(EXEOBJSc) $(EXERES) $(AFSDOBJS) $(EXELIBS)
        $(EXEGUILINK) $(VCLIBS)
 !IF ("$(AFSVER_CL)" == "1400")
-        if exist $@.manifest mt.exe -manifest afs_config.exe.manifest -out:$(MANIFEST)
+        if exist $@.manifest mt.exe -manifest afs_config.exe.manifest $@.manifest -out:$(MANIFEST)
 !ELSE
         $(COPY) afs_config.exe.manifest $(MANIFEST)
 !ENDIF