changeset 1753:e4cf3ec06955

Pick up prefix from configure for install target
author Chris Cannam
date Tue, 05 Dec 2017 14:29:23 +0000
parents 716e13004b19
children 076aca59192f
files config.pri.in configure configure.ac noconfig.pri sv.pro
diffstat 5 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/config.pri.in	Thu Nov 09 15:59:18 2017 +0000
+++ b/config.pri.in	Tue Dec 05 14:29:23 2017 +0000
@@ -1,6 +1,8 @@
 
 CONFIG += @QMAKE_CONFIG@
 
+PREFIX_PATH = @prefix@
+
 DEFINES += @HAVES@
 
 QMAKE_CC = @CC@
@@ -19,4 +21,3 @@
 LIBS += @LIBS@
 
 DEFINES += HAVE_PIPER HAVE_PLUGIN_CHECKER_HELPER
-
--- a/configure	Thu Nov 09 15:59:18 2017 +0000
+++ b/configure	Tue Dec 05 14:29:23 2017 +0000
@@ -7349,6 +7349,8 @@
 
 
 
+
+
 ac_config_files="$ac_config_files config.pri"
 
 
--- a/configure.ac	Thu Nov 09 15:59:18 2017 +0000
+++ b/configure.ac	Tue Dec 05 14:29:23 2017 +0000
@@ -133,6 +133,8 @@
 AC_SUBST(CC)
 AC_SUBST(CXX)
 
+AC_SUBST(prefix)
+
 AC_SUBST(QMAKE_CONFIG)
 
 AC_CONFIG_FILES([config.pri])
--- a/noconfig.pri	Thu Nov 09 15:59:18 2017 +0000
+++ b/noconfig.pri	Tue Dec 05 14:29:23 2017 +0000
@@ -4,6 +4,8 @@
 #CONFIG -= release
 #CONFIG += debug
 
+PREFIX_PATH = /usr/local
+
 DEFINES += NDEBUG BUILD_RELEASE
 DEFINES += NO_TIMING NO_HIT_COUNTS
 
--- a/sv.pro	Thu Nov 09 15:59:18 2017 +0000
+++ b/sv.pro	Tue Dec 05 14:29:23 2017 +0000
@@ -22,7 +22,7 @@
 }
 
 linux* {
-    sv_bins.path = /usr/local/bin/
+    sv_bins.path = $$PREFIX_PATH/bin/
     sv_bins.files = piper-vamp-simple-server vamp-plugin-load-checker sonic-visualiser
     INSTALLS += sv_bins
 }