From df556c0aa5778a40278e5e74c75ecf57cc6fdb61 Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Mon, 7 Sep 2020 18:44:40 +0100
Subject: [PATCH] fix debian build

---
 {scripts => debian}/make_debian_pkg.sh.in | 15 ++++++++-------
 debian/meson.build                        |  5 +++++
 debian/rules.in                           |  2 +-
 scripts/meson.build                       |  6 ------
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename {scripts => debian}/make_debian_pkg.sh.in (71%)

diff --git a/scripts/make_debian_pkg.sh.in b/debian/make_debian_pkg.sh.in
similarity index 71%
rename from scripts/make_debian_pkg.sh.in
rename to debian/make_debian_pkg.sh.in
index 0290bdc..69b1c0b 100755
--- a/scripts/make_debian_pkg.sh.in
+++ b/debian/make_debian_pkg.sh.in
@@ -11,19 +11,22 @@ deb_rules=$4
 deb_compat=$5
 deb_control=$6
 deb_copyright=$7
+private_dir="$8"
 
 inner_dir="@ZRYTHM_INNER_DIR_NAME@"
 dash_trial="@DASH_TRIAL@"
 
-tempdir=`mktemp -d`
-deb_parent_dir=$tempdir/$inner_dir
+rm -rf "$private_dir"
+mkdir -p "$private_dir"
+
+deb_parent_dir=$private_dir/$inner_dir
 deb_dir="$deb_parent_dir/debian"
 deb_src_dir="$deb_dir/source"
 mkdir -p $deb_parent_dir
 mkdir -p $deb_src_dir
 
 # prepare
-cp $deb_source_tarball $tempdir/
+cp $deb_source_tarball $private_dir/
 cp $deb_changelog $deb_dir/changelog
 cp $deb_compat $deb_dir/compat
 cp $deb_control $deb_dir/control
@@ -32,12 +35,10 @@ cp $deb_rules $deb_dir/rules
 echo "3.0 (native)" > $deb_src_dir/format
 
 # add tarball contents
-tar -xzf $deb_source_tarball -C $tempdir
+tar -xzf $deb_source_tarball -C $private_dir
 
 pushd $deb_parent_dir
 debuild -us -uc
 popd
 
-mv "$tempdir/zrythm$dash_trial"_*.deb "$out_pkg"
-
-#rm -rf $tempdir
+mv "$private_dir/zrythm$dash_trial"_*.deb "$out_pkg"
diff --git a/debian/meson.build b/debian/meson.build
index 25e3f12..3abdc20 100644
--- a/debian/meson.build
+++ b/debian/meson.build
@@ -66,6 +66,11 @@ debian_rules = configure_file (
   input: 'rules.in',
   configuration: debian_conf,
   )
+make_debian_pkg = configure_file (
+  output: 'make_debian_pkg.sh',
+  input: 'make_debian_pkg.sh.in',
+  configuration: debian_conf,
+  )
 
 # sources
 debian_zrythm_src_tarball = custom_target (
diff --git a/debian/rules.in b/debian/rules.in
index fdfd173..cc65062 100644
--- a/debian/rules.in
+++ b/debian/rules.in
@@ -33,4 +33,4 @@ override_dh_auto_install:
 		${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/
 	cp -RLv @BUILT_ZPLUGINS_DIR@/* \
 		${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/lv2/
-	if [ ! -f ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/carla/libcarla-host-plugin.so ] ; then exit 1 ; fi
+	if [ ! -f ${CURDIR}/debian/zrythm@DASH_TRIAL@/usr/lib/zrythm/lib/carla/libcarla_host-plugin.so ] ; then exit 1 ; fi
diff --git a/scripts/meson.build b/scripts/meson.build
index 4b7e54e..0dfde40 100644
--- a/scripts/meson.build
+++ b/scripts/meson.build
@@ -17,12 +17,6 @@
 
 # configure each script
 
-make_debian_pkg = configure_file (
-  output: 'make_debian_pkg.sh',
-  input: 'make_debian_pkg.sh.in',
-  configuration: global_conf,
-  )
-
 make_rpm_pkg = configure_file (
   output: 'make_rpm_pkg.sh',
   input: 'make_rpm_pkg.sh.in',