From 050ef0afadd03b58e9269f9d58463fc5794720f5 Mon Sep 17 00:00:00 2001 From: Patrick Grimm Date: Sun, 30 Oct 2016 22:45:50 +0100 Subject: [PATCH] fix uci lib and include dir --- Makefile | 1 + demo/Makefile | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ff371f5..f436aad 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ BACNET_DEFINES ?= $(MY_BACNET_DEFINES) # un-comment the next line to build in uci integration #BACNET_DEFINES += -DBAC_UCI #UCI_LIB_DIR ?= /usr/local/lib +#UCI_INCLUDE_DIR ?= /usr/local/include #BACDL_DEFINE=-DBACDL_ETHERNET=1 #BACDL_DEFINE=-DBACDL_ARCNET=1 diff --git a/demo/Makefile b/demo/Makefile index a452e14..aa19b2a 100644 --- a/demo/Makefile +++ b/demo/Makefile @@ -24,7 +24,7 @@ INCLUDES = $(INCLUDE1) $(INCLUDE2) BACNET_LIB := -L$(BACNET_LIB_DIR),-l$(BACNET_LIB_NAME) # build for UCI ifneq (,$(findstring -DBAC_UCI,$(BACNET_DEFINES))) -BACNET_LIB = $(BACNET_LIB),-L$(UCI_LIB_DIR),-luci +BACNET_LIB := $(BACNET_LIB),-L$(UCI_LIB_DIR),-luci endif # OS specific builds ifeq (${BACNET_PORT},linux) @@ -112,4 +112,3 @@ router: router-ipv6: $(MAKE) -b -C router-ipv6 -