diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3f51aa9..16df49a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,15 +19,16 @@ build: - apt update - apt install -y gcc g++ libssl-dev uuid-dev xsltproc docbook docbook-xsl libmariadbclient-dev - MOSQ_SRC=`pwd`/parts/mosquitto + - BUILD_DIR=`pwd` - pushd parts/mosquitto - sed -i 's,prefix=/usr/local,prefix=/opt,' config.mk - - env DESTDIR=$CI_BUILDS_DIR make - - env DESTDIR=$CI_BUILDS_DIR make install + - env DESTDIR=$BUILD_DIR make + - env DESTDIR=$BUILD_DIR make install - popd - pushd parts/mosquitto-auth-plug - - cat config.mk.in | sed 's,^MOSQUITTO_SRC =,MOSQUITTO_SRC = '"$CI_BUILDS_DIR"'/opt,' > config.mk + - cat config.mk.in | sed 's,^MOSQUITTO_SRC =,MOSQUITTO_SRC = '"$BUILD_DIR"'/opt,' > config.mk - sed -i 's,CFLAGS += -I$(MOSQUITTO_SRC)/src/,CFLAGS += -I$(MOSQUITTO_SRC)/include/,' Makefile - make - - cp auth-plug.so $CI_BUILDS_DIR/opt/lib + - cp auth-plug.so $BUILD_DIR/opt/lib - popd