From c591fb466f7ea682aef1628d42b67206b41cc710 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Thu, 19 May 2011 00:30:35 -0400
Subject: [PATCH] windows: merge module directory selection

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

Change-Id: I911aca232132111c8378a75ff1f4ed63c59e9044
---
 packages/windows/installer/NTMakefile | 2 ++
 1 file changed, 2 insertions(+)

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)")
 
-- 
2.11.4.GIT