From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Tue, 18 Sep 2007 07:05:28 +0000 (+0000)
Subject: DEVEL15-windows-nsis-20070918
X-Git-Tag: openafs-devel-1_5_25~13
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=35f72b0eaabdf643ba164ce5bfac6b99878972f4;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-nsis-20070918


fix error in NTMakefile that used the CL_1310 configuration for the
VS 2005 compiler

force RequestExecutionLevel to admin for Vista


(cherry picked from commit eae26ab6b2b618d55ffbd2498e37a53fddf59ed7)
---

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index 9c8770efd..f2c24561c 100644
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -86,7 +86,7 @@ prebuild:
    "$(NSISDIR)\makensis.exe" /VERSION >>$(OUT)\nsi-includes.nsi          
    echo. >>$(OUT)\nsi-includes.nsi                                       
 !if ("$(AFSVER_CL)" == "1400")
-   echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
+   echo !define CL_1400 1 >> $(OUT)\nsi-includes.nsi
 !else if ("$(AFSVER_CL)" == "1310")
    echo !define CL_1310 1 >> $(OUT)\nsi-includes.nsi
 !else if ("$(AFSVER_CL)" == "1300")
diff --git a/src/WINNT/install/NSIS/OpenAFS.nsi b/src/WINNT/install/NSIS/OpenAFS.nsi
index 32134a21a..a7778b9aa 100644
--- a/src/WINNT/install/NSIS/OpenAFS.nsi
+++ b/src/WINNT/install/NSIS/OpenAFS.nsi
@@ -327,6 +327,9 @@ VIAddVersionKey "PrivateBuild" "Checked/Debug"
   ReserveFile "AFSCell.ini"
   !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS ;InstallOptions plug-in
   !insertmacro MUI_RESERVEFILE_LANGDLL ;Language selection dialog
+
+  RequestExecutionLevel admin
+
 ;--------------------------------
 ; Macros
 ; Macro - Upgrade DLL File