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:
@@ -34,7 +34,7 @@ BBMD_DEFINE ?=-DBBMD_ENABLED=0
|
|||||||
DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) $(BBMD_DEFINE) -DWEAK_FUNC=
|
DEFINES = $(BACNET_DEFINES) $(BACDL_DEFINE) $(BBMD_DEFINE) -DWEAK_FUNC=
|
||||||
|
|
||||||
# directories
|
# directories
|
||||||
BACNET_PORT = linux
|
BACNET_PORT ?= linux
|
||||||
BACNET_PORT_DIR = ../ports/${BACNET_PORT}
|
BACNET_PORT_DIR = ../ports/${BACNET_PORT}
|
||||||
|
|
||||||
BACNET_OBJECT = ../demo/object
|
BACNET_OBJECT = ../demo/object
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
# Assumes rm and cp are available
|
# Assumes rm and cp are available
|
||||||
|
|
||||||
# Directories
|
# Directories
|
||||||
BACNET_PORT = linux
|
BACNET_PORT ?= linux
|
||||||
BACNET_PORT_DIR = ../../ports/${BACNET_PORT}
|
BACNET_PORT_DIR = ../../ports/${BACNET_PORT}
|
||||||
BACNET_INCLUDE = ../../include
|
BACNET_INCLUDE = ../../include
|
||||||
BACNET_OBJECT = ../../demo/object
|
BACNET_OBJECT = ../../demo/object
|
||||||
|
|||||||
Reference in New Issue
Block a user