Fix ardour2 -> ardour3 issues.

git-svn-id: svn://localhost/ardour2/branches/3.0@4622 d708f5d6-7413-0410-9779-e7cbd77b26cf

7 files changed, 11 insertions, 9 deletions

diff --git a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj
index 4026b65f59..8786691730 100644
--- a/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj
+++ b/libs/ardour/macosx/ardour.xcodeproj/project.pbxproj
@@ -1080,7 +1080,7 @@
 					/Library/Frameworks/SampleRate.framework/Headers,
 					/Library/Frameworks/Raptor.framework/Headers,
 					/Library/Frameworks/LRdf.framework/Headers,
-					/opt/ardour/src/ardour2/libs/surfaces/control_protocol,
+					/opt/ardour/src/ardour3/libs/surfaces/control_protocol,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = "";
@@ -1138,7 +1138,7 @@
 					/Library/Frameworks/SampleRate.framework/Headers,
 					/Library/Frameworks/Raptor.framework/Headers,
 					/Library/Frameworks/LRdf.framework/Headers,
-					/opt/ardour/src/ardour2/libs/surfaces/control_protocol,
+					/opt/ardour/src/ardour3/libs/surfaces/control_protocol,
 				);
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = "";
diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index a0ee2ac706..12a5e7c071 100644
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -161,7 +161,9 @@ Source::add_playlist (boost::shared_ptr<Playlist> pl)
 		res.first->second++;
 	}
 		
-	pl->GoingAway.connect (bind (mem_fun (*this, &Source::remove_playlist), boost::weak_ptr<Playlist> (pl)));
+	pl->GoingAway.connect (bind (
+			mem_fun (*this, &Source::remove_playlist),
+			boost::weak_ptr<Playlist> (pl)));
 }
 
 void
diff --git a/libs/clearlooks-newer/SConscript b/libs/clearlooks-newer/SConscript
index ca527c70da..6b71356dd2 100644
--- a/libs/clearlooks-newer/SConscript
+++ b/libs/clearlooks-newer/SConscript
@@ -40,7 +40,7 @@ else:
     Default (usable_libclearlooks)
 
 env.Alias('install', env.Install (
-        os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
+        os.path.join(install_prefix,env['LIBDIR'], 'ardour3', 'engines'),
         libclearlooks))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
diff --git a/libs/clearlooks-older/SConscript b/libs/clearlooks-older/SConscript
index 4feff6db90..dedf40f351 100644
--- a/libs/clearlooks-older/SConscript
+++ b/libs/clearlooks-older/SConscript
@@ -26,7 +26,7 @@ usable_libclearlooks = clearlooks.Install ('engines', libclearlooks)
 Default (usable_libclearlooks)
 
 env.Alias('install',
-          env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
+          env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour3', 'engines'),
                       libclearlooks))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
diff --git a/libs/surfaces/mackie/README b/libs/surfaces/mackie/README
index 5ed3a75fa5..5ffac15e5f 100644
--- a/libs/surfaces/mackie/README
+++ b/libs/surfaces/mackie/README
@@ -10,8 +10,8 @@ NOTES:
 
 * support for alsa/sequencer ports is currently broken. We're working on it.
 
-* you'll need to make port changes in etc/ardour2/ardour_system.rc and
-etc/ardour2/ardour.rc, otherwise they don't stay changed in ~/.ardour2/ardour.rc
+* you'll need to make port changes in etc/ardour3/ardour_system.rc and
+etc/ardour3/ardour.rc, otherwise they don't stay changed in ~/.ardour3/ardour.rc
 
 
 John Anderson
diff --git a/libs/surfaces/mackie/SConscript b/libs/surfaces/mackie/SConscript
index 96b37c2d6e..392fa2dcff 100644
--- a/libs/surfaces/mackie/SConscript
+++ b/libs/surfaces/mackie/SConscript
@@ -79,7 +79,7 @@ if mackie['SURFACES']:
 	Default(libardour_mackie)
 	if env['NLS']:
 		i18n (mackie, mackie_files, env)
-	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2','surfaces'), libardour_mackie))
+	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3','surfaces'), libardour_mackie))
 
 env.Alias('tarball', env.Distribute (env['DISTTREE'],
 				     [ 'SConscript' ] +
diff --git a/libs/surfaces/wiimote/SConscript b/libs/surfaces/wiimote/SConscript
index 8c8b3d4791..eee54f37e4 100644
--- a/libs/surfaces/wiimote/SConscript
+++ b/libs/surfaces/wiimote/SConscript
@@ -50,7 +50,7 @@ libardour_wiimote = wiimote.SharedLibrary('ardour_wiimote', wiimote_files)
 
 if wiimote['WIIMOTE']:
 	Default(libardour_wiimote)
-	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_wiimote))
+	env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_wiimote))
 
 if env['NLS']:
 	i18n (wiimote, wiimote_files, env)