Commit edfc7d5e authored by Alessio Netti's avatar Alessio Netti
Browse files

Merge remote-tracking branch 'origin/development' into development

parents fe6c230e b05cd858
......@@ -290,7 +290,6 @@ $(DCDBDEPSPATH)/opencv-$(OPENCV_VERSION)/.installed: $(DCDBDEPSPATH)/opencv-$(OP
@echo "Installing OpenCV library..."
cd $(@D) && cd build && make install && touch $(@)
#### CARLA
$(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.built: $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.patched
@echo ""
@echo "Building MariaDB Connector...";
......@@ -310,5 +309,4 @@ $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.built: $(DC
$(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.installed: $(DCDBDEPSPATH)/mariadb-connector-c-$(MARIADBCONNECTOR_VERSION)-src/.built | $(DCDBDEPLOYPATH)
@echo "Installing Maria DB Connector library..."
cd $(@D)/build && make install && touch $(@)
ln -s $(DCDBDEPLOYPATH)/lib/mariadb/libmariadb.so.3 $(DCDBDEPLOYPATH)/lib/libmariadb.so
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