diff --git a/meson.build b/meson.build index 5082a0c..2432270 100644 --- a/meson.build +++ b/meson.build @@ -131,8 +131,9 @@ carla_installation = custom_target ( output: 'carla-native-plugin.pc', input: carla_src_zip, command: [ - make_carla, '@INPUT@', carla_git_ver, '&&', - 'cp', temp_carla_pkgconfig_path / 'carla-native-plugin.pc', '@OUTPUT@', + make_carla, '@INPUT@', carla_git_ver, '@PRIVATE_DIR@', '&&', + 'cp', temp_carla_pkgconfig_path / 'carla-native-plugin.pc', + '@OUTPUT@', ], install: false, ) @@ -144,7 +145,8 @@ zplugins_installation = custom_target ( command: [ 'rm', '-rf', '@OUTPUT@', '&&', make_zplugins, zplugins_src_tarball, - temp_zplugins_prefix, temp_zplugins_suffix, '&&', + temp_zplugins_prefix, temp_zplugins_suffix, + '@PRIVATE_DIR@', '&&', 'mv', temp_zplugins_prefix / temp_zplugins_suffix, '@OUTPUT@' ], diff --git a/scripts/make_carla.sh.in b/scripts/make_carla.sh.in index 97ce175..fc7a2c1 100755 --- a/scripts/make_carla.sh.in +++ b/scripts/make_carla.sh.in @@ -4,6 +4,7 @@ set -e # full path to carla source zip carla_source_zip="$1" +private_dir="$2" prefix="@TEMP_CARLA_PREFIX@" carla_git_ver="@CARLA_GIT_VER@" @@ -14,7 +15,9 @@ export PKG_CONFIG_PATH=$prefix/lib/pkgconfig if pkg-config --atleast-version=2.1 carla-native-plugin ; then echo "latest carla installed" ; fi -tempdir=`mktemp -d` -unzip -o "$carla_source_zip" -d "$tempdir" -cd "$tempdir/Carla-$carla_git_ver" + +rm -rf $private_dir +mkdir -p $private_dir +unzip -o "$carla_source_zip" -d "$private_dir" +cd "$private_dir/Carla-$carla_git_ver" make -j4 && make install PREFIX="$prefix" LIBDIR=$prefix/@LIBDIR@ diff --git a/scripts/make_zplugins.sh.in b/scripts/make_zplugins.sh.in index 95a8bb5..74d87bb 100755 --- a/scripts/make_zplugins.sh.in +++ b/scripts/make_zplugins.sh.in @@ -9,17 +9,19 @@ prefix="$2" # lv2 dir suffix after the prefix, eg 'lib/lv2' lv2_dir="$3" +private_dir="$4" + meson_bin="@MESON_BIN@" zplugins_ver="@ZPLUGINS_VER@" echo `pwd` rm -rf "$prefix/$lv2_dir" -tempdir=`mktemp -d` -tar xf $tarball -C $tempdir -cd $tempdir/zplugins-$zplugins_ver +rm -rf $private_dir +mkdir -p $private_dir +tar xf $tarball -C $private_dir +cd $private_dir/zplugins-$zplugins_ver $meson_bin build --buildtype=debugoptimized \ --prefix=$prefix ninja -C build ninja -C build install -rm -rf $tempdir