diff options
| author | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-02-26 13:04:41 +0000 |
|---|---|---|
| committer | Nick Mainsbridge <beatroute@iprimus.com.au> | 2008-02-26 13:04:41 +0000 |
| commit | c25149cfe247ebbe552eccd6b9e8d3a92d870671 (patch) | |
| tree | e965c58e8cb8fb5ad89728e091a952422c88bd8b | |
| parent | 17b09708f64ecc5381988fe2e93606e8230340e9 (diff) | |
Add missing $PREFIX/share/ardour2 to uninstall target. Fix consequent missing icons thinko in previous commit.
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@3122 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | SConstruct | 3 | ||||
| -rw-r--r-- | gtk2_ardour/SConscript | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 462fea93e8..b68a45d621 100644 --- a/SConstruct +++ b/SConstruct @@ -1279,7 +1279,8 @@ the_revision = env.Command ('frobnicatory_decoy', [], create_stored_revision) remove_ardour = env.Command ('frobnicatory_decoy2', [], [ Delete ('$PREFIX/etc/ardour2'), Delete ('$PREFIX/lib/ardour2'), - Delete ('$PREFIX/bin/ardour2')]) + Delete ('$PREFIX/bin/ardour2'), + Delete ('$PREFIX/share/ardour2')]) env.Alias('revision', the_revision) env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour_system.rc')) diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index 0b3da94e06..2f4e426507 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -471,8 +471,7 @@ env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de # 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)) -if not env['FREEDESKTOP']: - 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', 'icons'), icon_files)) env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], [])) # This will install icons and MIME type as per freedesktop.org specs. # |