- Fix #4135: 64-bit Windows Installer Creates Entries Under The

  Wrong Registry Key.

git-svn-id: file:///svn/unbound/trunk@4798 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index daf94ab03dc41e5ba3e97c00d58f757ec835fc8f..58b60adad5487e4c05eabbd1687c4be751a2fb93 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+26 July 2018: Wouter
+       - Fix #4135: 64-bit Windows Installer Creates Entries Under The
+         Wrong Registry Key.
+
 23 July 2018: Wouter
        - Fix use-systemd readiness signalling, only when use-systemd is yes
          and not in signal handler.

diff --git a/makedist.sh b/makedist.sh
index ffc00c13b27940b5f464290cbd938b41ceeec6a8..359ee381775ccfd32cccd44c3da35491a9d84941 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -368,9 +368,9 @@ if [ "$DOWIN" = "yes" ]; then
     info "Creating installer"
     quadversion=`cat ../config.h | grep RSRC_PACKAGE_VERSION | sed -e 's/#define RSRC_PACKAGE_VERSION //' -e 's/,/\\./g'`
     cat ../winrc/setup.nsi | sed -e 's/define VERSION.*$/define VERSION "'$version'"/' -e 's/define QUADVERSION.*$/define QUADVERSION "'$quadversion'"/' > ../winrc/setup_ed.nsi
-    if test "$W64" = "yes"; then
+    if test "$W64" = "no"; then
        mv ../winrc/setup_ed.nsi ../winrc/setup_ed_old.nsi
-       cat ../winrc/setup_ed_old.nsi | sed -e 's/PROGRAMFILES/PROGRAMFILES64/' > ../winrc/setup_ed.nsi
+       cat ../winrc/setup_ed_old.nsi | sed -e 's/PROGRAMFILES64/PROGRAMFILES/' -e 's/SetRegView 64/SetRegView 32/' > ../winrc/setup_ed.nsi
     fi
     "$makensis" ../winrc/setup_ed.nsi
     info "Created installer"

diff --git a/winrc/setup.nsi b/winrc/setup.nsi
index 8f085228004c7f457f0cfe37375d98f82811f19c..ceb5c2b4ab26d63aad353e4fe1cd579f3ca4de5b 100644 (file)
--- a/winrc/setup.nsi
+++ b/winrc/setup.nsi
@@ -14,7 +14,8 @@ outFile "unbound_setup_${VERSION}.exe"
 Name "Unbound"
 
 # default install directory
-installDir "$PROGRAMFILES\Unbound"
+SetRegView 64
+installDir "$PROGRAMFILES64\Unbound"
 installDirRegKey HKLM "Software\Unbound" "InstallLocation"
 RequestExecutionLevel admin
 #give credits to Nullsoft: BrandingText ""