- 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

diff --git a/configure b/configure
index 26f2a0074a2405ea7029ad1577a3a799de276540..b3add6ec2410ceec45ac14be525f076a003d2ae9 100755 (executable)
--- 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 5036011e3e423cf1e6fa0c8962cb3e1573fbaad5..f38122ec4eb40f644b509bf4ad1f2c4e86e336ac 100644 (file)
--- 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 1d18e334d1bdd8a2029a67c7b3a586410ca632aa..862ef281dfde72b1ba20356992402fb7b12d7809 100644 (file)
--- 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 ddf4a06e038ad0f49480f01f0d9903ff6c74ad48..8c283fd5cb69ca993698e45be328112a79cc5355 100644 (file)
--- 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:\r
 \r
 rem directory for files\r
-set prefix="C:\Program Files (x86)"\r
+set prefix="C:\Program Files"\r
 set DESTDIR=%prefix%\Unbound\r
 \r
 rem issuer and subject name for certificates\r