From cb3803433491abfe7c58742dbe7801591b21694a Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Thu, 13 Nov 2014 19:57:40 +0100
Subject: install all additional binaries in $libdir

---
 tools/linux_packaging/build   | 2 +-
 tools/osx_packaging/osx_build | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'tools')

diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 72b7bf3893..2225b2064f 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -418,7 +418,7 @@ fi
 
 # vfork wrapper
 if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
-    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork
+    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $APPLIB
 fi
 
 # ALSA device reservation tool (if available)
diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index ba503d14c7..3e9f2945a9 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -110,7 +110,6 @@ ExportFormats=$Shared/export
 Templates=$Shared/templates
 PatchFiles=$Shared/patchfiles
 MackieControl=$Shared/mcp
-VFork=$Frameworks/vfork
 
 if [ x$PRINT_SYSDEPS != x ] ; then
 #
@@ -147,7 +146,6 @@ mkdir -p $Frameworks/modules
 mkdir -p $Etc
 mkdir -p $MackieControl
 mkdir -p $PatchFiles
-mkdir -p $VFork
 
 # maybe set variables
 env=""
@@ -393,13 +391,13 @@ fi
 
 # VST scanner app and wrapper script, if they exist
 if test -d $BUILD_ROOT/libs/fst ; then
-    cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/ || true
+    cp $BUILD_ROOT/libs/fst/ardour-vst-scanner* $Frameworks/
 fi
 
 # vfork wrapper
 if test -f $BUILD_ROOT/libs/vfork/ardour-exec-wrapper ; then
     mkdir -p $Frameworks/vfork
-    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $VFork
+    cp $BUILD_ROOT/libs/vfork/ardour-exec-wrapper $Frameworks/
 fi
 
 
-- 
cgit v1.2.3