From ba61286f1c9d7cb140a0688ef03e3d4108b69c7d Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Mon, 28 Jan 2013 23:05:00 +0100
Subject: [PATCH] build: use a proper $INSTDIR on win64 installer

By default, nsis installs under "Program files (x86)" on win64 platform
while the program, being a native win64 binary, must be installed under
"Program files". Modified NSis script accordingly.
---
 build/adg.nsi.in | 4 ++--
 configure.ac     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build/adg.nsi.in b/build/adg.nsi.in
index 828e0ff9..b054b176 100644
--- a/build/adg.nsi.in
+++ b/build/adg.nsi.in
@@ -14,9 +14,9 @@
 !include EnvVarUpdate.nsh
 
 Name "@PACKAGE_NAME@ @PACKAGE_VERSION@"
-OutFile "@abs_top_builddir@/@PACKAGE@-@PACKAGE_VERSION@-@WINSUFFIX@.exe"
+OutFile "@abs_top_builddir@/@PACKAGE@-@PACKAGE_VERSION@-win@ARCH@.exe"
 SetCompressor /SOLID lzma
-InstallDir "$PROGRAMFILES\@ADG_API_PACKAGE@"
+InstallDir "$PROGRAMFILES@ARCH@\@PACKAGE_NAME@"
 RequestExecutionLevel user
 
 ; ---------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 267bdf09..20db4c47 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,10 +76,10 @@ esac
 AM_CONDITIONAL([OS_UNIX],[test "${guessed_host}" != "mingw"])
 AM_CONDITIONAL([OS_WINDOWS],[test "${guessed_host}" = "mingw" -o "${guessed_host}" = "cygwin"])
 
-AS_IF([test "x${host_cpu}" = "xx86_64"],
-      [WINSUFFIX="win64"],[WINSUFFIX="win32"])
-AC_SUBST([WINSUFFIX])
-AM_SUBST_NOTMAKE([WINSUFFIX])
+dnl -win$ARCH will be appended to the Windows installer file name
+AS_IF([test "x${host_cpu}" = "xx86_64"],[ARCH=64],[ARCH=32])
+AC_SUBST([ARCH])
+AM_SUBST_NOTMAKE([ARCH])
 
 
 # Check for programs
-- 
2.11.4.GIT