diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-01-17 16:37:48 +0100 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-01-17 16:37:48 +0100 |
| commit | 64e585da09339be629f05195cfcff7b01dcb0497 (patch) | |
| tree | 9dd719002fa6dc372154c0adefe1855e55890616 /erts/etc/win32/nsis/Makefile | |
| parent | 2b0c190aa88716b24866b0a751cfe6252348ab00 (diff) | |
| parent | a0e362765d9d4afb0211f49eb787d2139b3eb7be (diff) | |
| download | otp-64e585da09339be629f05195cfcff7b01dcb0497.tar.gz otp-64e585da09339be629f05195cfcff7b01dcb0497.tar.bz2 otp-64e585da09339be629f05195cfcff7b01dcb0497.zip | |
Merge tag 'build/maint-r15/2013-01-14_20.31' into maint-r15
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}'`; \ |