aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-10-09 16:46:42 +0200
committerLukas Larsson <[email protected]>2012-10-09 16:46:42 +0200
commit85bc638ac4709cc16c646ef143689e1b8c7ef1e1 (patch)
tree62edacb6d13ec960a2b39f1517c705bd7fbe6ce0 /erts
parentf667680342e7fba3b5c8316f73a872147d502e01 (diff)
parentc185ce9928aa663cd74fecf58c5a56355d081943 (diff)
downloadotp-85bc638ac4709cc16c646ef143689e1b8c7ef1e1.tar.gz
otp-85bc638ac4709cc16c646ef143689e1b8c7ef1e1.tar.bz2
otp-85bc638ac4709cc16c646ef143689e1b8c7ef1e1.zip
Merge branch 'lukas/erts/whitespace_nsis_fix/OTP-10481' into maint
* lukas/erts/whitespace_nsis_fix/OTP-10481: Fix bug when making nsis target
Diffstat (limited to 'erts')
-rw-r--r--erts/etc/win32/nsis/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
index f377a68c69..a53ac708f8 100644
--- a/erts/etc/win32/nsis/Makefile
+++ b/erts/etc/win32/nsis/Makefile
@@ -91,7 +91,7 @@ release_spec:
fi;\
if [ '!' -z "$(REDIST_FILE)" -a '!' -z "$(REDIST_DLL_VERSION)" ];\
then \
- cp $(REDIST_FILE) "$(RELEASE_PATH)/$(REDIST_TARGET);"\
+ cp $(REDIST_FILE) "$(RELEASE_PATH)/$(REDIST_TARGET)";\
echo '!define HAVE_REDIST_FILE 1' >> $(VERSION_HEADER); \
echo '!define REDIST_DLL_VERSION "$(REDIST_DLL_VERSION)"' >> $(VERSION_HEADER);\
echo '!define REDIST_DLL_NAME "$(REDIST_DLL_NAME)"' >> $(VERSION_HEADER);\