diff options
| author | Lukas Larsson <[email protected]> | 2012-10-09 16:46:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2012-10-09 16:46:53 +0200 |
| commit | 0862c07826b3fd5496a9b3bab2bb0b54a8aa7655 (patch) | |
| tree | 31e82161fb4286df0b68310dd871b3ffcebfccf0 /erts | |
| parent | 47eb11f3d137dfa45ad1ad8d34c7a4d5124238d5 (diff) | |
| parent | 85bc638ac4709cc16c646ef143689e1b8c7ef1e1 (diff) | |
| download | otp-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/Makefile | 2 |
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);\ |