From 331e4034bfc3cfdb819bbd2552e7cb59b3960d6a Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 27 Jul 2020 00:38:15 +0100 Subject: [PATCH] Fix qjackctl build; Allow custom versions --- build-jack.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build-jack.sh b/build-jack.sh index 6801f31..46596b1 100755 --- a/build-jack.sh +++ b/build-jack.sh @@ -5,8 +5,8 @@ set -e cd $(dirname ${0}) PAWPAW_ROOT="${PWD}" -JACK2_VERSION=git -QJACKCTL_VERSION=0.6.2 +JACK2_VERSION=${JACK2_VERSION:=git} +QJACKCTL_VERSION=${QJACKCTL_VERSION:=0.6.2} # --------------------------------------------------------------------------------------------------------------------- @@ -227,7 +227,7 @@ if [ -f "${PAWPAW_PREFIX}/bin/moc" ]; then patch_file qjackctl "${QJACKCTL_VERSION}" "configure" 's/-ljack /-Wl,-Bdynamic -ljack -Wl,-Bstatic /' fi - build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version" + build_autoconf qjackctl "${QJACKCTL_VERSION}" "--enable-jack-version --with-jack=\"${jack2_prefix}${jack2_extra_prefix}\"" fi # ---------------------------------------------------------------------------------------------------------------------