From 6f5532f65948e6d01afb46caafe022fe6d6d87da Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sat, 27 Dec 2008 02:54:14 +0000 Subject: [PATCH] DEVEL15-windows-install-nsis-20081226 LICENSE MIT permit the location of the NSIS application to be configurable (cherry picked from commit f18b54bfe647cfee6a7072d11df04019161d8223) --- src/WINNT/install/NSIS/NTMakefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/WINNT/install/NSIS/NTMakefile b/src/WINNT/install/NSIS/NTMakefile index 8e1e1132a0..b13ac7fedc 100644 --- a/src/WINNT/install/NSIS/NTMakefile +++ b/src/WINNT/install/NSIS/NTMakefile @@ -3,7 +3,9 @@ RELDIR=WINNT\install\NSIS !INCLUDE ..\..\..\config\NTMakefile.version EXEDIR = $(DESTDIR)\WinInstall\Config +!IFNDEF NSISDIR NSISDIR = C:\Program Files\NSIS +!ENDIF # Revise the rule for compiling sources to use static libraries C2OBJ = $(cc) /Fo$@ /Fd$*.pdb $(cflags) $(cdebug) $(cvars) $(afscflags) $(afscdefs) /c