aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2012-10-09 16:46:53 +0200
committerLukas Larsson <[email protected]>2012-10-09 16:46:53 +0200
commit0862c07826b3fd5496a9b3bab2bb0b54a8aa7655 (patch)
tree31e82161fb4286df0b68310dd871b3ffcebfccf0 /erts
parent47eb11f3d137dfa45ad1ad8d34c7a4d5124238d5 (diff)
parent85bc638ac4709cc16c646ef143689e1b8c7ef1e1 (diff)
downloadotp-0862c07826b3fd5496a9b3bab2bb0b54a8aa7655.tar.gz
otp-0862c07826b3fd5496a9b3bab2bb0b54a8aa7655.tar.bz2
otp-0862c07826b3fd5496a9b3bab2bb0b54a8aa7655.zip
Merge branch 'maint'
* maint: 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);\