oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

windows: merge module directory selection

Browse Source 
permit an alternative location for the merge module
directory to be specified.

Change-Id: I911aca232132111c8378a75ff1f4ed63c59e9044
This commit is contained in:
Jeffrey Altman
2011-05-19 00:30:35 -04:00
parent f51c82c245
commit c591fb466f
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/windows/installer/NTMakefile
View File

@@ -110,10 +110,12 @@ CRTNAME=CRT
CRTNAME=DebugCRT
!endif
!if "$(MMDIR)"==""
MMDIR=$(ProgramFiles)\Common Files\Merge Modules
!if !exist($(MMDIR))
MMDIR=$(SystemDrive)\Program Files (x86)\Common Files\Merge Modules
!endif
!endif
!if exist("$(MMDIR)")