Commit e7ca5592 authored by Tristan Matthews's avatar Tristan Matthews

contrib: move into daemon

Rationale: only daemon uses it and it simplifies packaging, where
daemon is the top-level directory.

Change-Id: Id99bd61f2b0269e0fc594c1782cd7945120acf49
parent d45db1e7
......@@ -96,10 +96,10 @@ AC_ARG_WITH(contrib,
])
AC_MSG_CHECKING([for 3rd party libraries path])
AS_IF([test -z "${with_contrib}" || test "${with_contrib}" = "yes"], [
CONTRIB_DIR="${srcdir}/../contrib/${host}"
CONTRIB_DIR="${srcdir}/contrib/${host}"
AS_IF([test ! -d "${CONTRIB_DIR}"], [
echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR="${srcdir}/../contrib/`$CC -dumpmachine`"
CONTRIB_DIR="${srcdir}/contrib/`$CC -dumpmachine`"
AS_IF([test ! -d "${CONTRIB_DIR}"], [
echo "${CONTRIB_DIR} not found" >&AS_MESSAGE_LOG_FD
CONTRIB_DIR=""
......
......@@ -126,10 +126,11 @@ function build_contrib {
}
function build_daemon {
pushd daemon
# Build dependencies first
build_contrib
pushd daemon
# Run static analysis code tool
if [ $CODE_ANALYSIS == 1 ]; then
run_code_analysis
......
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