From 69655c578499c13b33c896173b105c91d6f27d02 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Wed, 14 Oct 2020 21:49:21 +0200 Subject: [PATCH] use meson compile and meson install --- install_deps.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/install_deps.sh b/install_deps.sh index 679bd10..3b50814 100755 --- a/install_deps.sh +++ b/install_deps.sh @@ -21,10 +21,10 @@ install_package() { meson) cd "${!PACKAGE_DIR}" meson build - cd build - ninja - sudo ninja install - cd ../.. + meson compile -C build + sudo meson install -C build + # DESTDIR=$DESTDIR ninja install + cd .. ;; cmake) mkdir "${!PACKAGE_DIR}/build" @@ -32,6 +32,7 @@ install_package() { cmake .. make sudo make install + # DESTDIR=$DESTDIR make install cd ../.. ;; *) @@ -41,6 +42,9 @@ install_package() { esac } +#DESTDIR=$(realpath .)/.deps +#rm -rf .${DESTDIR} +#mkdir ${DESTDIR} CURRENT_DIR=$(pwd) WORKING_DIR=$(mktemp -d /tmp/install_deps_XXXXXX)