Commit cd41374c authored by Alessio Netti's avatar Alessio Netti

Fixes to makefile targets

- Fixed install of BACNet headers on MAC OS
- Fixed install_conf target in analytics
parent 25de5a2b
......@@ -234,7 +234,8 @@ $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/.built: $(DCDBDEPSPATH)/bac
$(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/.installed: $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/.built | $(DCDBDEPLOYPATH)
@echo "Installing BACNet-Stack..."
install $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/include/* -D -t /$(DCDBDEPLOYPATH)/include/bacnet && \
mkdir $(DCDBDEPLOYPATH)/include/bacnet && \
install $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/include/* /$(DCDBDEPLOYPATH)/include/bacnet && \
install $(DCDBDEPSPATH)/bacnet-stack-$(BACNET-STACK_VERSION)/lib/libbacnet.a /$(DCDBDEPLOYPATH)/lib/ && touch $(@)
$(DCDBDEPSPATH)/freeipmi-$(FREEIPMI_VERSION)/.built: $(DCDBDEPSPATH)/freeipmi-$(FREEIPMI_VERSION)/.patched
......
......@@ -31,7 +31,7 @@ $(OBJS) : %.o : %.cpp
install_analyzer: $(ANALYZER_LIBS)
install $^ $(DCDBDEPLOYPATH)/lib/
install_conf: $(foreach p,global $(ANALYZERS),config/$(p).conf)
install_conf: $(foreach p,$(ANALYZERS),config/$(p).conf)
install -m 644 $^ $(DCDBDEPLOYPATH)/etc/
install: install_analyzer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment