diff options
| author | Erlang/OTP <[email protected]> | 2013-01-07 12:00:33 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2013-01-07 12:00:33 +0100 |
| commit | 47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5 (patch) | |
| tree | e488f7753c3a343fa57ab0a21f606d0e3dda23e3 /erts/etc/win32/nsis/Makefile | |
| parent | 3c05d3389f8b45e5b9f13a874de53ec521981a41 (diff) | |
| parent | 014f575ad684a2cf78925b839634ae6f90bb02e2 (diff) | |
| download | otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.tar.gz otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.tar.bz2 otp-47c5ff4d3f33af0a4fa7b6952a7066efcbdd82e5.zip | |
Merge branch 'fredrik/ssh/appup-r15b03-patch' into maint-r15
* fredrik/ssh/appup-r15b03-patch:
Fixed syntax appup ssh
Teach Win installer to handle redist on w2012/w8
Diffstat (limited to 'erts/etc/win32/nsis/Makefile')
| -rw-r--r-- | erts/etc/win32/nsis/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile index a53ac708f8..7bcecaa264 100644 --- a/erts/etc/win32/nsis/Makefile +++ b/erts/etc/win32/nsis/Makefile @@ -62,9 +62,15 @@ else endif REDIST_FILE=$(shell (sh ./find_redist.sh || echo "")) +ifeq ($(MSYSTEM),MINGW32) + NICEREDISTFILE=$(shell (msys2win_path.sh -m "$(REDIST_FILE)" 2>/dev/null || echo "")) +else + NICEREDISTFILE=$(shell (cygpath -d -m "$(REDIST_FILE)" 2>/dev/null || echo "")) +endif + REDIST_TARGET=$(shell (sh ./find_redist.sh -n || echo "")) -REDIST_DLL_VERSION=$(shell (sh ./dll_version_helper.sh || echo "")) -REDIST_DLL_NAME=$(shell (sh ./dll_version_helper.sh -n || echo "")) +REDIST_DLL_VERSION=$(shell (sh ./dll_version_helper.sh $(NICEREDISTFILE) || echo "")) +REDIST_DLL_NAME=$(shell (sh ./dll_version_helper.sh -n $(NICEREDISTFILE) || echo "")) release_spec: @NSIS_VER=`makensis /hdrinfo | head -1 | awk '{print $$2}'`; \ |