From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeIsH-0007em-T7 for qemu-devel@nongnu.org; Thu, 07 Nov 2013 01:15:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeIs9-0002ks-5J for qemu-devel@nongnu.org; Thu, 07 Nov 2013 01:15:25 -0500 Received: from qemu.weilnetz.de ([37.221.198.45]:54933 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeIs8-0002kc-Ul for qemu-devel@nongnu.org; Thu, 07 Nov 2013 01:15:17 -0500 From: Stefan Weil Date: Thu, 7 Nov 2013 07:15:07 +0100 Message-Id: <1383804909-376-2-git-send-email-sw@weilnetz.de> In-Reply-To: <1383804909-376-1-git-send-email-sw@weilnetz.de> References: <1383804909-376-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH for 1.7 1/3] nsis: Improved support for parallel installation of 32 and 64 bit code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Stefan Weil , qemu-devel 32 and 64 bit variants of QEMU already had different default installation directories, but used a common registry key for saving the choosen directory. This is confusing for users who want to install both variants, so fix it by using different registry keys. Signed-off-by: Stefan Weil --- qemu.nsi | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qemu.nsi b/qemu.nsi index 0dc1f52..cc5fafd 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -60,7 +60,11 @@ InstallDir $PROGRAMFILES\qemu ; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) -InstallDirRegKey HKLM "Software\qemu" "Install_Dir" +!ifdef W64 +InstallDirRegKey HKLM "Software\qemu64" "Install_Dir" +!else +InstallDirRegKey HKLM "Software\qemu32" "Install_Dir" +!endif ; Request administrator privileges for Windows Vista. RequestExecutionLevel admin -- 1.7.10.4