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.
This commit is contained in:
gri6507
2011-11-25 23:30:11 +00:00
parent 26681f7f39
commit d009a1a15e
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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