DEVEL15-windows-client-config-manifest-20081226

LICENSE BSD
FIXES 123889

remove extraneous reference to the output manifest file which resulted
in two manifests being generated with conflicting UAC values.

(cherry picked from commit 06468cb9393aca2c58cc75ee51bfb50f56957c52)

diff --git a/src/WINNT/client_config/NTMakefile b/src/WINNT/client_config/NTMakefile
index c3dc5e9..f0e1247 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 $(MANIFEST) -out:$(MANIFEST)
+        if exist $@.manifest mt.exe -manifest afs_config.exe.manifest -out:$(MANIFEST)
 !ELSE
         $(COPY) afs_config.exe.manifest $(MANIFEST)
 !ENDIF