build-unit-test-docker: Fix all PREFIX references
This makes sure we are using the variable we have defined for the prefix
instead of directly assuming that everything lives in /usr
Change-Id: I60da5400a3b606e015ab8a13cadaecd30493ae27
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/build-unit-test-docker.sh b/build-unit-test-docker.sh
index 39fda3b..dbbc320 100755
--- a/build-unit-test-docker.sh
+++ b/build-unit-test-docker.sh
@@ -183,13 +183,13 @@
make && make install
RUN curl -L https://github.com/USCiLab/cereal/archive/v1.2.2.tar.gz | tar -xz && \
-cp -a cereal-1.2.2/include/cereal/ /usr/local/include/
+cp -a cereal-1.2.2/include/cereal/ ${PREFIX}/include/
-RUN mkdir /usr/local/include/nlohmann/ && \
-curl -L -o /usr/local/include/nlohmann/json.hpp https://github.com/nlohmann/json/releases/download/v3.0.1/json.hpp
+RUN mkdir ${PREFIX}/include/nlohmann/ && \
+curl -L -o ${PREFIX}/include/nlohmann/json.hpp https://github.com/nlohmann/json/releases/download/v3.0.1/json.hpp
RUN curl -L https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2 | tar -xj && \
-cp -a -r boost_1_66_0/boost /usr/local/include
+cp -a -r boost_1_66_0/boost ${PREFIX}/include
# version from meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_5.0.1.bb
RUN curl -L https://github.com/leethomason/tinyxml2/archive/37bc3aca429f0164adf68c23444540b4a24b5778.tar.gz | tar -xz && \
@@ -262,7 +262,7 @@
RUN curl -L https://github.com/openbmc/phosphor-logging/archive/${PKG_REV['phosphor-logging']}.tar.gz | tar -xz && \
cd phosphor-logging-* && \
./bootstrap.sh && \
-./configure ${CONFIGURE_FLAGS[@]} --enable-metadata-processing YAML_DIR=/usr/local/share/phosphor-dbus-yaml/yaml && \
+./configure ${CONFIGURE_FLAGS[@]} --enable-metadata-processing YAML_DIR=${PREFIX}/share/phosphor-dbus-yaml/yaml && \
make -j$(nproc) && \
make install