From 9a10895479392e1b3c6c73e0f05d43c53bb71422 Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Fri, 14 Sep 2018 16:13:41 +0100
Subject: [PATCH] Fixes to release building on Windows.

---
 prism/Makefile            | 4 ++--
 prism/src/nsis_script.nsi | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/prism/Makefile b/prism/Makefile
index 71dd3282..de15c619 100644
--- a/prism/Makefile
+++ b/prism/Makefile
@@ -575,9 +575,9 @@ release_check_version:
 build_release:
 	@if [ "$(BINDISTSUFFIX)" = "win32" -o "$(BINDISTSUFFIX)" = "win64" ]; then \
 		echo Creating Windows installer in "release/$(BIN_DIST_INST)"... && \
-		makensis /NOCD /DPRISM_NAME="PRISM $(VERSION)" /DPRISM_BUILD="prism-$(VERSION)" /DPRISM_BINDISTSUFFIX="$(BINDISTSUFFIX)" /DPRISM_DIR="" src/nsis_script.nsi && \
+		makensis /NOCD /DPRISM_NAME="PRISM $(VERSION)" /DPRISM_BUILD="prism-$(VERSION)" /DPRISM_BINDISTSUFFIX="$(BINDISTSUFFIX)" /DPRISM_DIR=".." src/nsis_script.nsi && \
 		mkdir -p release && \
-		mv "$(BIN_DIST_INST)" release; \
+		mv ../"$(BIN_DIST_INST)" release; \
 	else \
 		echo Creating binary distribution in "release/$(BIN_DIST_FILE)"... && \
 		mkdir -p release && \
diff --git a/prism/src/nsis_script.nsi b/prism/src/nsis_script.nsi
index 661c90b8..b29bcaf7 100644
--- a/prism/src/nsis_script.nsi
+++ b/prism/src/nsis_script.nsi
@@ -9,8 +9,7 @@
 ; * PRISM X.y" is the name of the program displayed to the user
 ; * prism-3.0 is the4 name of the build (no spaces)
 ; * winXX is win32 or win6
-; The PRISM_DIR variable should be set to "" if the working directory
-; is the prism directory or to the prism directory otherwise (ending with `\').
+; The PRISM_DIR variable should be set to the top-level PRISM dir (usually ..)
 
 # --------------------------------------------------------------------------- #
 
@@ -30,7 +29,7 @@ OutFile         "..\${PRISM_BUILD}-${PRISM_BINDISTSUFFIX}-installer.exe"
 CRCCheck        on
 
 LicenseText     "For your information:" "Next >"
-LicenseData     "${PRISM_DIR}COPYING.txt"
+LicenseData     "${PRISM_DIR}\COPYING.txt"
 
 InstallDir      "$PROGRAMFILES64\${PRISM_BUILD}"