From: Matt Benjamin Date: Sat, 27 Dec 2008 02:27:56 +0000 (+0000) Subject: DEVEL15-windows-client-config-manifest-20081226 X-Git-Tag: openafs-devel-1_5_56~12 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=828ca0902da55f88e40d73dce1c109827a6b23e7;p=packages%2Fo%2Fopenafs.git 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 c3dc5e9e9..f0e1247a7 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 $(MANIFEST) -out:$(MANIFEST) + if exist $@.manifest mt.exe -manifest afs_config.exe.manifest -out:$(MANIFEST) !ELSE $(COPY) afs_config.exe.manifest $(MANIFEST) !ENDIF