do proper install on x86_64 system, remove stupid debuggig code from panner, handle...

git-svn-id: svn://localhost/ardour2/trunk@1264 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index f32b5a3e4b2f99fb35a86f6d35e57f6d4320bc9a..b9079e34e74ec591071ccf3db6e224e034393c0d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -631,6 +631,13 @@ if env['FPU_OPTIMIZATION']:
             print "\nWarning: you are building Ardour with SSE support even though your system does not support these instructions. (This may not be an error, especially if you are a package maintainer)"
 # end optimization section
 
+# handle x86/x86_64 libdir properly
+
+if env['DIST_TARGET'] == 'x86_64':
+    env['LIBDIR']='lib64'
+else:
+    env['LIBDIR']='lib'
+
 #
 # save off guessed arch element in an env
 #

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 466713272a279042ff67ca791db14fe6ed870023..f2c51e18a00d78c1e075cd6542947a30db000006 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -272,6 +272,7 @@ tt = gtkmmtests.Program(target = 'tt', source = tt_files)
 
 my_subst_dict = { }
 my_subst_dict['%INSTALL_PREFIX%'] = final_prefix
+my_subst_dict['%LIBDIR%'] = env['LIBDIR']
 
 ardoursh = env.SubstInFile ('ardour.sh','ardour.sh.in', SUBST_DICT = my_subst_dict);
 env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
@@ -279,7 +280,7 @@ env.AddPostAction (ardoursh, Chmod ('$TARGET', 0755))
 if env['VST']:
        Default(ardourlib)
        # the library - into the library dir
-       env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardourlib))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardourlib))
 else:
 
        if env['VERSIONED']:
@@ -290,7 +291,7 @@ else:
         #install
 
        # the executable - into the library dir
-       env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), ardour))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), ardour))
        # the script - into the bin dir
        env.Alias('install', env.InstallAs(os.path.join(install_prefix, 'bin')+'/ardour2', ardoursh))
 
@@ -303,9 +304,9 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.bindings'))
 env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour.colors'))
 # data files
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), 'splash.png'))
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files))
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/icons'), icon_files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2'), 'splash.png'))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'pixmaps'), pixmap_files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'icons'), icon_files))
 
 env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], []))
                

diff --git a/gtk2_ardour/ardour.bindings b/gtk2_ardour/ardour.bindings
index 83006ea1458941dac3ab6fd38e85bab4a627eac4..dcb75c754835d5942ecb0718ad7c6e09cc4cfa6f 100644 (file)
--- a/gtk2_ardour/ardour.bindings
+++ b/gtk2_ardour/ardour.bindings
@@ -218,8 +218,8 @@
 ; (gtk_accel_path "<Actions>/Editor/PullupPlus1" "")
 ; (gtk_accel_path "<Actions>/Editor/Smpte24976" "")
 ; (gtk_accel_path "<Actions>/options/FileDataFormat24bit" "")
-(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<Control>o")
 ; (gtk_accel_path "<Actions>/Editor/SnapMode" "")
+(gtk_accel_path "<Actions>/Common/ToggleOptionsEditor" "<Control>o")
 ; (gtk_accel_path "<Actions>/Editor/PullupMinus4" "")
 (gtk_accel_path "<Actions>/Common/goto-mixer" "<Alt>m")
 ; (gtk_accel_path "<Actions>/Editor/addExternalAudioToTrack" "")

diff --git a/gtk2_ardour/ardour.sh.in b/gtk2_ardour/ardour.sh.in
index 107321024b6c79e0d62c7871cdf335b5b0a64888..835cbd4582e06e7f2953f85197ac45e459a3d51d 100644 (file)
--- a/gtk2_ardour/ardour.sh.in
+++ b/gtk2_ardour/ardour.sh.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-export GTK_PATH=%INSTALL_PREFIX%/lib/ardour2:$GTK_PATH
+export GTK_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$GTK_PATH
 
-export LD_LIBRARY_PATH=%INSTALL_PREFIX%/lib/ardour2:$LD_LIBRARY_PATH 
+export LD_LIBRARY_PATH=%INSTALL_PREFIX%/%LIBDIR%/ardour2:$LD_LIBRARY_PATH 
 # DYLD_LIBRARY_PATH is for Darwin
 export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
 
-exec %INSTALL_PREFIX%/lib/ardour2/ardour.bin $*
+exec %INSTALL_PREFIX%/%LIBDIR%/ardour2/ardour.bin $*
 
 

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 67d1554b408e0f105ee251182355707b9b3251ed..6f4d50aa029864d3c361cb469cc7e6d2c5d512eb 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1813,14 +1813,6 @@ This prevents the session from being loaded."));
                new_session = new Session (*engine, path, snap_name, mix_template);
        }
 
-       /* handle this one in a different way than all others, so that its clear what happened */
-       
-       catch (AudioEngine::PortRegistrationFailure& err) {
-               error << _("Unable to create all required ports")
-                     << endmsg;
-               return -1;
-       }
-
        catch (...) {
 
                error << string_compose(_("Session \"%1 (snapshot %2)\" did not load successfully"), path, snap_name) << endmsg;

diff --git a/gtk2_ardour/pixmaps/SConscript b/gtk2_ardour/pixmaps/SConscript
index c532d3551afc96c02bc8163adaa81cd90a5c7fd4..194031c44f23e284b51c4f1ebba504b30902ae46 100644 (file)
--- a/gtk2_ardour/pixmaps/SConscript
+++ b/gtk2_ardour/pixmaps/SConscript
@@ -5,6 +5,6 @@ import glob
 pixmap_files = glob.glob('*.xpm')
 
 Import('env install_prefix')
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour/pixmaps'), pixmap_files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour', 'pixmaps'), pixmap_files))
 
 env.Alias('tarball', env.Distribute(env['DISTTREE'], [ 'SConscript' ] + pixmap_files))

diff --git a/libs/appleutility/SConscript b/libs/appleutility/SConscript
index c8bab03a87e1063f54e1df32f70317cdd648b1af..68b731c78ed7e12786eff895a2ac76e8f6543d2e 100644 (file)
--- a/libs/appleutility/SConscript
+++ b/libs/appleutility/SConscript
@@ -17,6 +17,6 @@ appleutility.Append(LINKFLAGS='-framework CoreServices')
 libappleutility = appleutility.SharedLibrary('appleutility', appleutility_files)
 if appleutility['COREAUDIO']:
     Default(libappleutility)
-    env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libappleutility))
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libappleutility))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'], ['SConscript'] + appleutility_files + glob.glob('*.h') ))

diff --git a/libs/ardour/SConscript b/libs/ardour/SConscript
index 9f77f0af9c569c0c417dd3dc8c7d5accf40d7e57..b602613a6a2faaf0d2cdcf14b16f1fb3b6504039 100644 (file)
--- a/libs/ardour/SConscript
+++ b/libs/ardour/SConscript
@@ -113,10 +113,10 @@ if ardour['LIBLO']:
     extra_sources += osc_files
 
 ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
-ardour.Append(CXXFLAGS="-DDATA_DIR=\\\""+final_prefix+"/share\\\"")
-ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\""+final_prefix+"/lib\\\"")
-ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\""+final_config_prefix+"\\\"")
-ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\""+final_prefix+"/share/locale\\\"")
+ardour.Append(CXXFLAGS="-DDATA_DIR=\\\"" + os.path.join (final_prefix, 'share') + "\\\"")
+ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR']) + "\\\"")
+ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\"" + final_config_prefix + "\\\"")
+ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\"" + os.path.join (final_prefix, 'share', 'locale') + "\\\"")
 
 ardour.Merge ([ libraries['jack'] ])
 
@@ -299,7 +299,7 @@ if env['NLS']:
        i18n (ardour, ardour_files + vst_files + coreaudio_files + audiounit_files, env)
 
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour))
 
 env.Alias('version', ardour.VersionBuild(['version.cc', 'ardour/version.h'], []))
 

diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 1c72697347faf18e6d2f8b3db2ab0fd4d58f2b3e..64b917c6e9e08b9582136c8e081cad93d2ccedc2 100644 (file)
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -514,21 +514,13 @@ IO::deliver_output_no_pan (vector<Sample *>& bufs, uint32_t nbufs, nframes_t nfr
                dst = (*o)->get_buffer (nframes) + offset;
                src = bufs[min(nbufs,i)];
 
-               if (_name == "Audio 2") {
-                       for (nframes_t x = 0; x < nframes; ++x) {
-                               dst[x] = 0.7;
-                       }
-
+               if (dg != _gain || actual_gain == 1.0f) {
+                       memcpy (dst, src, sizeof (Sample) * nframes);
+               } else if (actual_gain == 0.0f) {
+                       memset (dst, 0, sizeof (Sample) * nframes);
                } else {
-                       
-                       if (dg != _gain || actual_gain == 1.0f) {
-                               memcpy (dst, src, sizeof (Sample) * nframes);
-                       } else if (actual_gain == 0.0f) {
-                               memset (dst, 0, sizeof (Sample) * nframes);
-                       } else {
-                               for (nframes_t x = 0; x < nframes; ++x) {
-                                       dst[x] = src[x] * actual_gain;
-                               }
+                       for (nframes_t x = 0; x < nframes; ++x) {
+                               dst[x] = src[x] * actual_gain;
                        }
                }
                

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 0c2961c82a200d29b3b3f1a6f218fcd2127cc3b9..b58d414ffd66638051147cbde60726b9015cad23 100644 (file)
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -313,6 +313,14 @@ Session::second_stage_init (bool new_session)
                when_engine_running();
        }
 
+       /* handle this one in a different way than all others, so that its clear what happened */
+       
+       catch (AudioEngine::PortRegistrationFailure& err) {
+               error << _("Unable to create all required ports")
+                     << endmsg;
+               return -1;
+       }
+
        catch (...) {
                return -1;
        }

diff --git a/libs/clearlooks/SConscript b/libs/clearlooks/SConscript
index fe8acf915f9ceb9b4db948b58315e96a3b7ed9a8..110bfe41bef5884095afe8fb29e7b494f61dfc6c 100644 (file)
--- a/libs/clearlooks/SConscript
+++ b/libs/clearlooks/SConscript
@@ -23,7 +23,7 @@ usable_libclearlooks = clearlooks.Install ('engines', libclearlooks)
 Default (usable_libclearlooks)
 
 env.Alias('install',
-          env.Install(os.path.join(install_prefix,'lib/ardour2/engines'),
+          env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
                       libclearlooks))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],

diff --git a/libs/flowcanvas/SConscript b/libs/flowcanvas/SConscript
index 6394982a20e6e26a800b757965a04e64c9b7beca..18b061ef82512231b19951841be30cafd9f8c513 100644 (file)
--- a/libs/flowcanvas/SConscript
+++ b/libs/flowcanvas/SConscript
@@ -39,7 +39,7 @@ libflowcanvas = flowcanvas.SharedLibrary('flowcanvas', flowcanvas_files)
 
 Default(libflowcanvas)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libflowcanvas))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libflowcanvas))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      ['SConscript'] +

diff --git a/libs/glibmm2/SConscript b/libs/glibmm2/SConscript
index dbc58e64994155884f48e1d690026a99368e9e1d..267f846203b61659d6c504f95aca45ef0ce31449 100644 (file)
--- a/libs/glibmm2/SConscript
+++ b/libs/glibmm2/SConscript
@@ -28,7 +28,7 @@ else :
 
 Default([glibmm2_config_h, libglibmm2])
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglibmm2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libglibmm2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript',

diff --git a/libs/gtkmm2/atk/SConscript b/libs/gtkmm2/atk/SConscript
index 884ac3cbb08702301eff5ea7e038a75f7b4fbc31..84a5e8251adfe650e8497d4e4bbea57d665765a7 100644 (file)
--- a/libs/gtkmm2/atk/SConscript
+++ b/libs/gtkmm2/atk/SConscript
@@ -13,7 +13,7 @@ atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ])
 libatkmm = atkmm.SharedLibrary('atkmm', atkmm_files)
 Default(libatkmm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libatkmm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libatkmm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'atkmm.h'] + 

diff --git a/libs/gtkmm2/gdk/SConscript b/libs/gtkmm2/gdk/SConscript
index 58f0ebb2e5cc10864a5575b8627776c38b735224..6ea5c7cfef7cc770f4e4b89c1ad0455ff850621e 100644 (file)
--- a/libs/gtkmm2/gdk/SConscript
+++ b/libs/gtkmm2/gdk/SConscript
@@ -14,7 +14,7 @@ gdkmm2.Append(CXXFLAGS="-Ilibs/gtkmm2/gtk")
 libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files)
 Default(libgdkmm2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgdkmm2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgdkmm2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'gdkmmconfig.h', 'gdkmm.h'] + 

diff --git a/libs/gtkmm2/gtk/SConscript b/libs/gtkmm2/gtk/SConscript
index 90e832b010cefd6ab64d4504fac79c299226c930..b4cd99f02369d89fc340975849b30e3504666ff1 100644 (file)
--- a/libs/gtkmm2/gtk/SConscript
+++ b/libs/gtkmm2/gtk/SConscript
@@ -13,7 +13,7 @@ gtkmm2.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'], libra
 libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
 Default(libgtkmm2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgtkmm2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'gtkmmconfig.h', 'gtkmm.h'] + 

diff --git a/libs/gtkmm2/pango/SConscript b/libs/gtkmm2/pango/SConscript
index 0ec62a0f0235c5bf63715127425fac49e8f72990..d045cf20435f03c87fcf74b076fc3ac502dbd8de 100644 (file)
--- a/libs/gtkmm2/pango/SConscript
+++ b/libs/gtkmm2/pango/SConscript
@@ -13,7 +13,7 @@ pangomm.Merge([libraries['glibmm2'], libraries['pango'], libraries['sigc2']])
 libpangomm = pangomm.SharedLibrary('pangomm', pangomm_files)
 Default(libpangomm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpangomm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpangomm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'pangomm.h'] + 

diff --git a/libs/gtkmm2ext/SConscript b/libs/gtkmm2ext/SConscript
index fa69755d93d51501105648fcfe014b94a6cf59e1..9c7511c85dadcbaec7348a1cf7666f0bdf99c94b 100644 (file)
--- a/libs/gtkmm2ext/SConscript
+++ b/libs/gtkmm2ext/SConscript
@@ -69,7 +69,7 @@ Default(libgtkmm2ext)
 if env['NLS']:
     i18n (gtkmm2ext, gtkmm2ext_files, env)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgtkmm2ext))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2ext))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h'] +

diff --git a/libs/libglademm/SConscript b/libs/libglademm/SConscript
index 1ee69265807d044d01fcbef40dc9f4c0da79604c..0d22ba243fcf322d647e211cd94f1acb925aaa54 100644 (file)
--- a/libs/libglademm/SConscript
+++ b/libs/libglademm/SConscript
@@ -15,7 +15,7 @@ libglade = libglademm.SharedLibrary('libglademm', libglademm_files)
 
 Default(libglade)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libglade))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libglade))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'libglademmconfig.h', 'libglademm.h'] +

diff --git a/libs/libgnomecanvasmm/SConscript b/libs/libgnomecanvasmm/SConscript
index d9620dc378eb597429f47f7ca15d6653c47cb153..7cab8b707a9a0f952f44de664c442a0c7050ed56 100644 (file)
--- a/libs/libgnomecanvasmm/SConscript
+++ b/libs/libgnomecanvasmm/SConscript
@@ -20,7 +20,7 @@ gnomecanvasmm.Merge([libraries['glibmm2'],
 libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files)
 Default(libgnomecanvasmm)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libgnomecanvasmm))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgnomecanvasmm))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'libgnomecanvasmmconfig.h', 'libgnomecanvasmm.h'] +

diff --git a/libs/libsndfile/SConscript b/libs/libsndfile/SConscript
index 5817397e9546da7feb5db5279a9f70de5a44b0d3..9e8ccc93f721a86ea7f09eb3ba2fdd240598cd42 100644 (file)
--- a/libs/libsndfile/SConscript
+++ b/libs/libsndfile/SConscript
@@ -32,7 +32,7 @@ sndfile_h = sndfile.Command('src/sndfile.h', ['src/sndfile.h.in'], 'cd libs/libs
 
 Default([sndfile_h,libsndfile])
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libsndfile))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsndfile))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript
index b0f048890b6ae942c067bef8d1a2f9217f4a9959..bc2c50cb2c74154ae215632cf721c40e3e31bcd4 100644 (file)
--- a/libs/midi++2/SConscript
+++ b/libs/midi++2/SConscript
@@ -51,7 +51,7 @@ libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
 
 Default(libmidi2)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libmidi2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libmidi2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript' ] + sources + sysdep_sources +

diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index b16880b2868b9b3339b3ccf7e97efb446411733b..f5c65c3b2cbb9f7d6fecfab40fec52052af140cb 100644 (file)
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -67,7 +67,7 @@ mount_env.Program('mountpoint', 'mountpoint.cc')
 if env['NLS']:
     i18n (pbd, pbd_files, env)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libpbd))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpbd))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] +

diff --git a/libs/sigc++2/SConscript b/libs/sigc++2/SConscript
index 65833dfb530b628f09aec2b371fb4de2421a1f33..b29aefb0cd807a028e71b621de377ed0f91e1812 100644 (file)
--- a/libs/sigc++2/SConscript
+++ b/libs/sigc++2/SConscript
@@ -20,7 +20,7 @@ else :
 
 Default([sigc2_config_h,libsigc2])
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libsigc2))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsigc2))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                      [ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

diff --git a/libs/soundtouch/SConscript b/libs/soundtouch/SConscript
index d37fd1f99b78bf3b023919148bfda5aa53c0e187..9ddee87b0c3457dd6b63cb235b8821f351a2eb6e 100644 (file)
--- a/libs/soundtouch/SConscript
+++ b/libs/soundtouch/SConscript
@@ -23,7 +23,7 @@ libst = st.SharedLibrary('soundtouch', soundtouch_files)
 
 Default(libst)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libst))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libst))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
        [ 'SConscript'] + soundtouch_files + glob.glob('*.h')))

diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript
index 88aeeda376c6b3deef62d0927898dad52e71ff34..026698500a55c9502c4c7dd669f2e8f825f89380 100644 (file)
--- a/libs/surfaces/control_protocol/SConscript
+++ b/libs/surfaces/control_protocol/SConscript
@@ -50,7 +50,7 @@ Default(libardour_cp)
 if env['NLS']:
        i18n (cp, cp_files, env)
              
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libardour_cp))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour_cp))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +

diff --git a/libs/surfaces/generic_midi/SConscript b/libs/surfaces/generic_midi/SConscript
index 8405f07d12e3952f7a5c3a8437070f6ef7f32510..6c76e054649b8410ce3a2ac8ba6017968a9a491c 100644 (file)
--- a/libs/surfaces/generic_midi/SConscript
+++ b/libs/surfaces/generic_midi/SConscript
@@ -51,7 +51,7 @@ Default(libardour_genericmidi)
 if env['NLS']:
        i18n (genericmidi, genericmidi_files, env)
              
-env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_genericmidi))
+env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_genericmidi))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +

diff --git a/libs/surfaces/tranzport/SConscript b/libs/surfaces/tranzport/SConscript
index c79620fcb35f87b9048fdab1ca36b6a46b058eab..5d390f3e2ffe29b9986f3209f749de846d6029b4 100644 (file)
--- a/libs/surfaces/tranzport/SConscript
+++ b/libs/surfaces/tranzport/SConscript
@@ -48,7 +48,7 @@ if tranzport['TRANZPORT']:
        Default(libardour_tranzport)
        if env['NLS']:
                i18n (tranzport, tranzport_files, env)
-       env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2/surfaces'), libardour_tranzport))
+       env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_tranzport))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
                                     [ 'SConscript' ] +

diff --git a/templates/SConscript b/templates/SConscript
index 874d70cf0693dd5f9de952bf4c016581224e91d5..60a80c5619c2163f9f6fafe197d0e37e2baf47b7 100644 (file)
--- a/templates/SConscript
+++ b/templates/SConscript
@@ -14,5 +14,5 @@ for template in template_files:
 
 Default(template_build)
 
-env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/templates'), files))
+env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'templates'), files))
 env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + template_build))

diff --git a/vst/SConscript b/vst/SConscript
index 2a4d492f8a6b5ff676cbc768e3760583a29dc4dd..eb4dd6683b0fa3d0dcf630be2732da47d4699ff8 100644 (file)
--- a/vst/SConscript
+++ b/vst/SConscript
@@ -74,7 +74,7 @@ if ardour_vst['VST']:
     # the wine script - into the bin dir
     env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable))
     # the win32 executable - into the lib dir since the wine script will look for it there
-    env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), 'ardour_vst.exe.so'))
+    env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), 'ardour_vst.exe.so'))
 
 env.Alias ('tarball', env.Distribute (env['DISTTREE'],
                                       [ 'SConscript',