diff --git a/Dockerfile b/Dockerfile index 589b2bd2d..0288dcb50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -85,7 +85,6 @@ ARG WITH_LIBWEBSOCKETS='v\d+(\.\d+)+' # ARG FREERDP_OPTS="\ - -DALLOW_IN_SOURCE_BUILD=ON \ -DBUILTIN_CHANNELS=OFF \ -DCHANNEL_URBDRC=OFF \ -DWITH_ALSA=OFF \ diff --git a/src/guacd-docker/bin/build-all.sh b/src/guacd-docker/bin/build-all.sh index 09a6ce6be..430419cfe 100755 --- a/src/guacd-docker/bin/build-all.sh +++ b/src/guacd-docker/bin/build-all.sh @@ -84,15 +84,21 @@ install_from_git() { # Configure build using CMake or GNU Autotools, whichever happens to be # used by the library being built if [ -e CMakeLists.txt ]; then - cmake -DCMAKE_INSTALL_PREFIX:PATH="$PREFIX_DIR" "$@" . + cmake \ + -B "${REPO_DIR}-build" -S . \ + -DCMAKE_INSTALL_PREFIX:PATH="$PREFIX_DIR" \ + "$@" + + # Build and install + cmake --build "${REPO_DIR}-build" + cmake --install "${REPO_DIR}-build" else [ -e configure ] || autoreconf -fi ./configure --prefix="$PREFIX_DIR" "$@" - fi - - # Build and install - make && make install + # Build and install + make && make install + fi } #