Windows: NSIS installer requires the architecture for CL=1400

[openafs.git] / src / WINNT / install / NSIS / NTMakefile

diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile
index 7740832..5b13447 100644 (file)
--- a/src/WINNT/install/NSIS/NTMakefile
+++ b/src/WINNT/install/NSIS/NTMakefile
@@ -3,7 +3,9 @@ RELDIR=WINNT\install\NSIS
 !INCLUDE ..\..\..\config\NTMakefile.version
 
 EXEDIR = $(DESTDIR)\WinInstall\Config
+!IFNDEF NSISDIR
 NSISDIR = C:\Program Files\NSIS
+!ENDIF
 
 # Revise the rule for compiling sources to use static libraries
 C2OBJ   = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(cvars) $(afscflags) $(afscdefs) /c
@@ -24,6 +26,7 @@ $(EXEDIR)\Service.exe: $(OUT)\Service.obj $(OUT)\Service.res
       $(EXECONLINK) 
       $(_VC_MANIFEST_EMBED_EXE)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 $(OUT)\Killer.res: Killer.rc AFS_component_version_number.h
 
@@ -34,6 +37,7 @@ $(EXEDIR)\Killer.exe: $(OUT)\Killer.obj $(OUT)\Killer.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 $(OUT)\AdminGroup.res: AdminGroup.rc AFS_component_version_number.h
 
@@ -44,23 +48,32 @@ $(EXEDIR)\AdminGroup.exe: $(OUT)\AdminGroup.obj $(OUT)\AdminGroup.res
       $(EXECONLINK) 
         $(_VC_MANIFEST_EMBED_EXE)
         $(CODESIGN_USERLAND)
+        $(SYMSTORE_IMPORT)
 
 !IF ("$(AFSDEV_BUILDTYPE)"=="FREE")
 !IF ("$(CPU)" == "i386")
+MSI_PLATFORM=Intel
 ARCH=x86
 !ELSE IF ("$(CPU)" == "amd64")
+MSI_PLATFORM=x64
 ARCH=x64
 !ELSE
+MSI_PLATFORM=$(CPU)
 ARCH=$(CPU)
 !ENDIF
+MSI_CONFIG=Retail
 !ELSE
 !IF ("$(CPU)" == "i386")
-ARCH=Intel
+MSI_PLATFORM=Intel
+ARCH=x86
 !ELSE IF ("$(CPU)" == "amd64")
+MSI_PLATFORM=x64
 ARCH=x64
 !ELSE
+MSI_PLATFORM=$(CPU)
 ARCH=$(CPU)
 !ENDIF
+MSI_CONFIG=Debug
 !ENDIF
 
 !IF ("$(CPU)" == "i386")
@@ -79,7 +92,7 @@ $(MSVCMSI): $(OUT)\vcruntime.wixobj
        $(CODESIGN_USERLAND)
 
 $(OUT)\vcruntime.wixobj: vcruntime.wxs
-       candle -out $@ $** -dPlatform=$(ARCH) -dConfig=Debug -dVCVer=$(AFSVER_CL)
+       candle -out $@ $** -dPlatform=$(MSI_PLATFORM) -dConfig=$(MSI_CONFIG) -dVCVer=$(AFSVER_CL)
 
 !else
 MSVCMSI=