From 5b34bde1a418b8f587d130e73ee8c3b085bcbad1 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 22 Feb 2017 07:31:32 +0000
Subject: [PATCH] - Fix #1224: Fix that defaults should not fall back to
 "Program Files   (x86) if Unbound is 64bit by default on windows.

git-svn-id: file:///svn/unbound/trunk@4018 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 configure                       | 6 +++---
 configure.ac                    | 6 +++---
 doc/Changelog                   | 4 ++++
 winrc/unbound-control-setup.cmd | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/configure b/configure
index 26f2a0074..b3add6ec2 100755
--- a/configure
+++ b/configure
@@ -4105,7 +4105,7 @@ fi
 if test $on_mingw = "no"; then
   ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"`
 else
-  ub_conf_file="C:\\Program Files (x86)\\Unbound\\service.conf"
+  ub_conf_file="C:\\Program Files\\Unbound\\service.conf"
 fi
 
 # Check whether --with-conf_file was given.
@@ -4236,7 +4236,7 @@ else
   if test $on_mingw = no; then
     UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
 else
-    UNBOUND_ROOTKEY_FILE="C:\\Program Files (x86)\\Unbound\\root.key"
+    UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
 fi
 
 fi
@@ -4258,7 +4258,7 @@ else
   if test $on_mingw = no; then
     UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
 else
-    UNBOUND_ROOTCERT_FILE="C:\\Program Files (x86)\\Unbound\\icannbundle.pem"
+    UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
 fi
 
 fi
diff --git a/configure.ac b/configure.ac
index 5036011e3..f38122ec4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,7 +121,7 @@ fi
 if test $on_mingw = "no"; then
   ub_conf_file=`eval echo "${sysconfdir}/unbound/unbound.conf"`
 else
-  ub_conf_file="C:\\Program Files (x86)\\Unbound\\service.conf"
+  ub_conf_file="C:\\Program Files\\Unbound\\service.conf"
 fi
 AC_ARG_WITH([conf_file],
         AC_HELP_STRING([--with-conf-file=path], 
@@ -191,7 +191,7 @@ AC_ARG_WITH(rootkey-file,
 if test $on_mingw = no; then
     UNBOUND_ROOTKEY_FILE="$UNBOUND_RUN_DIR/root.key"
 else
-    UNBOUND_ROOTKEY_FILE="C:\\Program Files (x86)\\Unbound\\root.key"
+    UNBOUND_ROOTKEY_FILE="C:\\Program Files\\Unbound\\root.key"
 fi
 )
 AC_SUBST(UNBOUND_ROOTKEY_FILE)
@@ -205,7 +205,7 @@ AC_ARG_WITH(rootcert-file,
 if test $on_mingw = no; then
     UNBOUND_ROOTCERT_FILE="$UNBOUND_RUN_DIR/icannbundle.pem"
 else
-    UNBOUND_ROOTCERT_FILE="C:\\Program Files (x86)\\Unbound\\icannbundle.pem"
+    UNBOUND_ROOTCERT_FILE="C:\\Program Files\\Unbound\\icannbundle.pem"
 fi
 )
 AC_SUBST(UNBOUND_ROOTCERT_FILE)
diff --git a/doc/Changelog b/doc/Changelog
index 1d18e334d..862ef281d 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+22 February 2017: Wouter
+	- Fix #1224: Fix that defaults should not fall back to "Program Files
+	  (x86) if Unbound is 64bit by default on windows.
+
 21 February 2017: Wouter
 	- iana portlist update
 
diff --git a/winrc/unbound-control-setup.cmd b/winrc/unbound-control-setup.cmd
index ddf4a06e0..8c283fd5c 100644
--- a/winrc/unbound-control-setup.cmd
+++ b/winrc/unbound-control-setup.cmd
@@ -37,7 +37,7 @@ rem SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 rem settings:
 
 rem directory for files
-set prefix="C:\Program Files (x86)"
+set prefix="C:\Program Files"
 set DESTDIR=%prefix%\Unbound
 
 rem issuer and subject name for certificates