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 9c8770efd3f267d21b060260c6f9b18461859811..f2c24561c39e3e4f772e7b9c0cdae74c6648a936 100644 (file)
--- 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 32134a21a211105df94392bfa4ce06749d515abc..a7778b9aa72ba2512397a98e7440aea1aa3ec9c2 100644 (file)
--- 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