From 47e1d24963a4afe457d75db7ce6896b946f4e9be Mon Sep 17 00:00:00 2001
From: Alexandros Theodotou <alex@zrythm.org>
Date: Sat, 5 Sep 2020 17:49:55 +0100
Subject: [PATCH] fix arch build

---
 arch/PKGBUILD.in               |  3 +--
 arch/meson.build               |  2 ++
 scripts/make_arch_pkg.sh.in    | 19 +++++++++----------
 scripts/make_user_manual.sh.in | 17 ++++++++++-------
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/arch/PKGBUILD.in b/arch/PKGBUILD.in
index 2803bdd..22ac33f 100644
--- a/arch/PKGBUILD.in
+++ b/arch/PKGBUILD.in
@@ -47,8 +47,7 @@ package() {
   install -vDm 644 AUTHORS CONTRIBUTING.md CHANGELOG.md README.md THANKS TRANSLATORS \
     -t "${pkgdir}/usr/share/doc/zrythm/"
   DESTDIR="${pkgdir}/" ninja -C build install
-  mkdir -p "${pkgdir}/usr/lib/zrythm/lib"
-  cp -R /usr/lib/zrythm/lib/carla ${pkgdir}/usr/lib/zrythm/lib/
+  mkdir -p "${pkgdir}/usr/lib/zrythm/lib/lv2"
   cp -RLv @TEMP_CARLA_PREFIX@/@LIBDIR@/carla \
     ${pkgdir}/usr/lib/zrythm/lib/
   cp -RLv @BUILT_ZPLUGINS_DIR@/* \
diff --git a/arch/meson.build b/arch/meson.build
index b45fa26..c876ae3 100644
--- a/arch/meson.build
+++ b/arch/meson.build
@@ -37,6 +37,7 @@ arch_pkg = custom_target (
   command: [
     make_arch_pkg, '@OUTPUT@', '@INPUT0@', '@INPUT1@',
     zrythm_src_tarball_filename, arch_pkg_filename,
+    '@PRIVATE_DIR@',
     ],
   depends: [
     carla_installation,
@@ -58,6 +59,7 @@ if not build_trial
       command: [
         make_user_manual, '@OUTPUT@', '@INPUT0@',
         zrythm_src_tarball_filename, lang,
+        '@PRIVATE_DIR@',
         ],
       install: true,
       install_dir: get_option ('prefix') / 'manuals',
diff --git a/scripts/make_arch_pkg.sh.in b/scripts/make_arch_pkg.sh.in
index 82e6966..fc97ab8 100755
--- a/scripts/make_arch_pkg.sh.in
+++ b/scripts/make_arch_pkg.sh.in
@@ -7,18 +7,17 @@ out_pkg="$1"
 pkgbuild=$2
 zrythm_src_tarball="$3"
 zrythm_src_tarball_filename="$4"
+arch_pkg_filename="$5"
+private_dir="$6"
 
-tempdir=`mktemp -d`
-
-cp $pkgbuild $tempdir/
-cp $zrythm_src_tarball $tempdir/
+rm -rf $private_dir
+mkdir -p $private_dir
+cp $pkgbuild $private_dir/
+cp $zrythm_src_tarball $private_dir/
 
 # build manuals
-pushd $tempdir
+pushd $private_dir
 makepkg -f
-popd $tempdir
-
-ls $tempdir
-exit 1
+popd
 
-#rm -rf $tempdir
+cp $private_dir/*.pkg.tar.zst $out_pkg
diff --git a/scripts/make_user_manual.sh.in b/scripts/make_user_manual.sh.in
index 12e883c..982b03c 100755
--- a/scripts/make_user_manual.sh.in
+++ b/scripts/make_user_manual.sh.in
@@ -7,23 +7,26 @@ out_file="$1"
 zrythm_src_tarball="$2"
 zrythm_src_tarball_filename="$3"
 lang="$4"
+private_dir="$5"
+
+rm -rf $private_dir
+mkdir -p $private_dir
 
 inner_dir="@ZRYTHM_INNER_DIR_NAME@"
 meson_bin="@MESON_BIN@"
 
-tempdir=`mktemp -d`
-
-cp $zrythm_src_tarball $tempdir/
+cp $zrythm_src_tarball $private_dir/
 
 # build manuals
-pushd $tempdir
+pushd $private_dir
 tar xf $zrythm_src_tarball_filename
 pushd $inner_dir
 $meson_bin build
 sed -i -e 's/latexpdf/latex/' doc/user/meson.build
 ninja -C build latex-manual-$lang ;
 make -C build/doc/user/$lang/latex ;
+popd
+popd
 
-cp build/doc/user/$lang/latex/Zrythm.pdf $out_file
-
-#rm -rf $tempdir
+cp $private_dir/$inner_dir/build/doc/user/$lang/latex/Zrythm.pdf \
+  $out_file