From 62f23674d0c1ae94d29b19eb9c3e52bd4ed8753d Mon Sep 17 00:00:00 2001 From: sletz Date: Mon, 3 Mar 2008 22:13:24 +0000 Subject: [PATCH] Marc-Olivier Barre Scons patch. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@1897 0c269be4-1314-0410-8aa9-9f06e86f4224 --- ChangeLog | 4 +++- SConstruct | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c950a400..ac675a4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,7 +11,8 @@ Tom Szilagyi Andrzej Szombierski Kjetil S.Matheussen Pieter Palmers -Tim Blechmann +Tim Blechmann +Marc-Olivier Barre --------------------------- Jackdmp changes log @@ -21,6 +22,7 @@ Tim Blechmann * Correct JackSocketClientChannel::ClientClose to use ServerSyncCall instead of ServerAsyncCall. * Better documentation in jack.h. + * Marc-Olivier Barre Scons patch. 2008-03-02 Stephane Letz diff --git a/SConstruct b/SConstruct index 3b787383..c895d2eb 100644 --- a/SConstruct +++ b/SConstruct @@ -52,7 +52,7 @@ opts.AddOptions( PathOption( "BINDIR", "Overwrite the directory where apps are installed to.", "$PREFIX/bin", PathOption.PathAccept ), PathOption( "LIBDIR", "Overwrite the directory where libs are installed to.", "$PREFIX/lib", PathOption.PathAccept ), PathOption( "INCLUDEDIR", "Overwrite the directory where headers are installed to.", "$PREFIX/include", PathOption.PathAccept ), - PathOption( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/libffado", PathOption.PathAccept ), + PathOption( "SHAREDIR", "Overwrite the directory where misc shared files are installed to.", "$PREFIX/share/jackmp", PathOption.PathAccept ), BoolOption( "ENABLE_ALSA", "Enable/Disable the ALSA backend.", True ), BoolOption( "ENABLE_FREEBOB", "Enable/Disable the FreeBoB backend.", True ), BoolOption( "ENABLE_FIREWIRE", "Enable/Disable the FireWire backend.", True ), @@ -230,6 +230,9 @@ env.ScanReplace( "config.h.in" ) NoCache("config.h") AlwaysBuild("config.h") +# ensure we have a path to where the libraries are +env.AppendUnique( LIBPATH=["#/common"] ) + # # Start building #