From 6bc2bacc5003b82ae5a7e07baccd63ab62871610 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sun, 4 Jan 2009 19:19:49 +0000 Subject: [PATCH] DEVEL15-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. (cherry picked from commit bf51eaca47db1bbf58490d770f1be105e69f7ea9) --- src/WINNT/client_config/NTMakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile index f0e1247a7..34a337501 100644 --- 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 -- 2.39.5