diff options
| author | Jeffrey Altman <jaltman@secure-endpoints.com> | 2011-05-19 00:30:35 -0400 |
|---|---|---|
| committer | Jeffrey Altman <jaltman@secure-endpoints.com> | 2011-05-19 00:32:53 -0400 |
| commit | c591fb466f7ea682aef1628d42b67206b41cc710 (patch) | |
| tree | 4c2f4b11c7a01636865e96c97945bb4b5c31f69d /packages | |
| parent | f51c82c245b4f5db8a65ea0b655ff08241f6ccf5 (diff) | |
windows: merge module directory selection
permit an alternative location for the merge module
directory to be specified.
Change-Id: I911aca232132111c8378a75ff1f4ed63c59e9044
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/windows/installer/NTMakefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile index 54af6064b..77a2491fc 100644 --- a/packages/windows/installer/NTMakefile +++ b/packages/windows/installer/NTMakefile @@ -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)") |