diff options
| author | Patrik Nyblom <[email protected]> | 2012-11-28 16:33:09 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2012-11-28 16:33:09 +0100 |
| commit | af68f5a22f995284b07ece178c42e630ecf94d54 (patch) | |
| tree | 9570f76810c2dde61e25c76ddc302daec5afb3e9 /erts/etc/win32/nsis/Makefile | |
| parent | d5de2e1ffd6403f5d7ec62e6ce8da508e1cb1239 (diff) | |
| parent | a175f808c69f2ad944e92d0006c66c258fc10fc7 (diff) | |
| download | otp-af68f5a22f995284b07ece178c42e630ecf94d54.tar.gz otp-af68f5a22f995284b07ece178c42e630ecf94d54.tar.bz2 otp-af68f5a22f995284b07ece178c42e630ecf94d54.zip | |
Merge branch 'pan/win2012_installer' into maint
* pan/win2012_installer:
Teach Win installer to handle redist on w2012/w8
OTP-10598
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}'`; \ |