From d009a1a15ec8eed0630be7d46755bcda1a5b300b Mon Sep 17 00:00:00 2001
From: gri6507 <gri6507@1e814d3a-8a88-4260-be86-c0dc25669c1e>
Date: Fri, 25 Nov 2011 23:30:11 +0000
Subject: [PATCH] Pulled in the changes from SVN commit 2145 (Makefiles default
 BACNET_PORT to linux only if that ENV VAR has not yet been specified) into
 the trunk.

---
 bacnet-stack/Makefile      | 2 +-
 bacnet-stack/demo/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile
index 007fa10a..d7cbf4cb 100644
--- a/bacnet-stack/Makefile
+++ b/bacnet-stack/Makefile
@@ -34,7 +34,7 @@ BBMD_DEFINE ?=-DBBMD_ENABLED=0
 DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) $(BBMD_DEFINE) -DWEAK_FUNC=
 
 # directories
-BACNET_PORT = linux
+BACNET_PORT ?= linux
 BACNET_PORT_DIR = ../ports/${BACNET_PORT}
 
 BACNET_OBJECT = ../demo/object
diff --git a/bacnet-stack/demo/Makefile b/bacnet-stack/demo/Makefile
index 839269c9..ced45d3d 100644
--- a/bacnet-stack/demo/Makefile
+++ b/bacnet-stack/demo/Makefile
@@ -8,7 +8,7 @@
 # Assumes rm and cp are available
 
 # Directories
-BACNET_PORT = linux
+BACNET_PORT ?= linux
 BACNET_PORT_DIR = ../../ports/${BACNET_PORT}
 BACNET_INCLUDE = ../../include
 BACNET_OBJECT = ../../demo/object