Small installer fix.

diff --git a/etc/Deployment/make.bat b/etc/Deployment/make.bat
index dab5b49..aa1f1fe 100644 (file)
--- a/etc/Deployment/make.bat
+++ b/etc/Deployment/make.bat
@@ -220,7 +220,7 @@ attrib +R "%OUT_FILE%.exe"
 "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" cyan "Signing output file..."
 "%~dp0\..\..\..\Prerequisites\CEcho\cecho.exe" cyan "===========================================================================\n"
 
-"%~dp0\..\..\..\Prerequisites\GnuPG\gpg.exe" --detach-sign "%OUT_FILE%.exe"
+"%~dp0\..\..\..\Prerequisites\GnuPG\bin\gpg.exe" --detach-sign "%OUT_FILE%.exe"
 attrib +R "%OUT_FILE%.exe.sig"
 
 :: ---------------------------------------------------------------------------

diff --git a/etc/NSIS/setup.nsi b/etc/NSIS/setup.nsi
index 9b8b093..1d668cb 100644 (file)
--- a/etc/NSIS/setup.nsi
+++ b/etc/NSIS/setup.nsi
@@ -82,7 +82,7 @@
 ;--------------------------------
 
 !tempfile PACKHDRTEMP
-!packhdr "${PACKHDRTEMP}" '"..\Utilities\MT.exe" -manifest "setup.manifest" -outputresource:"${PACKHDRTEMP};1"'
+!packhdr "${PACKHDRTEMP}" '"..\..\..\Prerequisites\MSVC\redist\bin\mt.exe" -manifest "setup.manifest" -outputresource:"${PACKHDRTEMP};1" && "..\..\..\Prerequisites\UPX\upx.exe" --brute "${PACKHDRTEMP}"'
 
 
 ;--------------------------------
@@ -116,8 +116,6 @@ InstallDirRegKey HKLM "${MyRegPath}" "InstallLocation"
 SetCompressor /SOLID LZMA
 SetCompressorDictSize 64
 
-#!packhdr "$%TEMP%\exehead.tmp" '"${LAMEXP_UPX_PATH}\upx.exe" --brute "$%TEMP%\exehead.tmp"'
-
 
 ;--------------------------------
 ;Reserved Files