merge 3578:4901 of thirdparty/rubberband/current

[ardour.git] / libs / rubberband / SConscript

diff --git a/libs/rubberband/SConscript b/libs/rubberband/SConscript
index 82a9f1fa5c63805c93182d1aa50e09daa38b59ea..9c3226526cfe0caf5452aaa86d4e70c4e21169e6 100644 (file)
--- a/libs/rubberband/SConscript
+++ b/libs/rubberband/SConscript
@@ -10,10 +10,10 @@ Import('env install_prefix libraries')
 rb = env.Clone()
 
 rb.Merge  ([libraries['fftw3f'], 
-           libraries['fftw3'],
+            libraries['fftw3'],
             libraries['vamp'],
             libraries['samplerate'],
-            libraries['sndfile-ardour']
+            libraries['sndfile']
             ])
 
 rb.Append (CPPATH='#libs/rubberband/rubberband', CXXFLAGS="-Ilibs/rubberband/rubberband")
@@ -22,7 +22,7 @@ librb = rb.SharedLibrary('rubberband', rubberband_files)
 
 Default(librb)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), librb))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), librb))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript'] +