From e3983f8a574f4bb4b54bba5995c5f8be0ac78957 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Tue, 28 Jul 2015 16:51:46 -0700
Subject: [PATCH] Get rid of -I on Mac and Linux since we include miniupnpc
 headers by direct path reference.

---
 make-linux.mk | 1 -
 make-mac.mk   | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/make-linux.mk b/make-linux.mk
index 7697e3ace..2ef9b9850 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -43,7 +43,6 @@ endif
 
 ifeq ($(ZT_USE_MINIUPNPC),1)
 	DEFS+=-DZT_USE_MINIUPNPC
-	INCLUDES+=-Iext/bin/miniupnpc/include
 ifeq ($(UNAME_M),armv6l)
 	MINIUPNPC_LIB=ext/bin/miniupnpc/linux-arm32/libminiupnpc.a
 endif
diff --git a/make-mac.mk b/make-mac.mk
index 707d517cc..c0b3f89d1 100644
--- a/make-mac.mk
+++ b/make-mac.mk
@@ -14,7 +14,7 @@ include objects.mk
 OBJS+=osdep/OSXEthernetTap.o
 
 # Comment out to disable building against shipped libminiupnpc binary for Mac
-ZT_USE_MINIUPNPC=1
+ZT_USE_MINIUPNPC?=1
 
 # Disable codesign since open source users will not have ZeroTier's certs
 CODESIGN=echo
@@ -38,7 +38,6 @@ endif
 
 ifeq ($(ZT_USE_MINIUPNPC),1)
 	DEFS+=-DZT_USE_MINIUPNPC
-	INCLUDES+=-Iext/bin/miniupnpc/include
 	LIBS+=ext/bin/miniupnpc/mac-x64/libminiupnpc.a
 	OBJS+=osdep/UPNPClient.o
 endif