From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36965) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPpz3-000724-4F for qemu-devel@nongnu.org; Sat, 28 Sep 2013 04:34:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VPpz2-0005hX-43 for qemu-devel@nongnu.org; Sat, 28 Sep 2013 04:34:37 -0400 Received: from qemu.weilnetz.de ([2a03:4000:2:362::1]:48956 helo=v2201305906712890.yourvserver.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VPpz1-0005gz-Tk for qemu-devel@nongnu.org; Sat, 28 Sep 2013 04:34:36 -0400 From: Stefan Weil Date: Sat, 28 Sep 2013 10:34:30 +0200 Message-Id: <1380357270-18474-1-git-send-email-sw@weilnetz.de> Subject: [Qemu-devel] [PATCH] 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: qemu-devel Cc: Stefan Weil 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 1d57455..1418baf 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