diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-07-20 17:56:16 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-07-20 17:56:16 +0000 |
| commit | 6b04299ae4447454d93fde81237830373b90488e (patch) | |
| tree | bba07faea75d72a6ecaaebab02e6c347b8e3fbc4 /packaging/nsis/Makefile.nmake | |
| parent | 40e08c936d0e5a49bb7932b454292cfd5623427c (diff) | |
According to
http://blogs.msdn.com/b/astebner/archive/2010/10/20/10078468.aspx
and bug 7507 the Visual C++ 2010 redistributable installer might want
to reboot the system. Tell it not to do that and request a reboot at
the end of the installation process if needed.
svn path=/trunk/; revision=43864
Diffstat (limited to 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index d174a8c01a..b16b4fec35 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -92,7 +92,9 @@ NSIS_FLAGS=\ /DMAKEDIR=$(MAKEDIR) \ /DSTAGING_DIR=$(STAGING_DIR) \ /DWIRESHARK_TARGET_PLATFORM=$(WIRESHARK_TARGET_PLATFORM) \ + /DTARGET_MACHINE=$(TARGET_MACHINE) \ /DMSVC_VARIANT=$(MSVC_VARIANT) \ + /DMSC_VER_REQUIRED=$(MSC_VER_REQUIRED) \ /DWIRESHARK_LIB_DIR=$(WIRESHARK_LIB_DIR) \ !IFDEF MSVCR_DLL /DMSVCR_DLL="$(MSVCR_DLL)" \ |