Fix #1258: 64bit getting installed in C:\Program Files (x86).

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

diff --git a/doc/Changelog b/doc/Changelog
index 895aaf6b6570af144cb1743161d8b12727f6f2ad..cdb395287a4ffa2e7d50d45e4db6807adaa00cbd 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
          by "#ifdef SHA256_DIGEST_LENGTH@daemon/remote.c".
        - iana portlist update
        - Fix #1258: Windows 10 X64 unbound 1.6.2 service will not start.
+         and fix that 64bit getting installed in C:\Program Files (x86).
 
 26 April 2017: Ralph
        - Implemented trust anchor signaling using key tag query.

diff --git a/makedist.sh b/makedist.sh
index 1b98d879b1abfb46258d199fa914ecb529e8bd1a..53c5cec74e45d3fb5f83afd0660748da981fbba5 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -368,6 +368,10 @@ 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
+       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
+    fi
     "$makensis" ../winrc/setup_ed.nsi
     info "Created installer"
     cd ..