allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

VST support now builds a useful script and installs correctly; fix leftovers for solo_latch and solo_model in configuration changes

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@932 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2006-09-26 21:54:51 +00:00
parent c6964a4ccf
commit 3e6feb62ae
10 changed files with 52 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SConstruct
View File

@@ -15,7 +15,7 @@ import SCons.Node.FS
SConsignFile()
EnsureSConsVersion(0, 96)
version = '2.0beta2'
version = '2.0beta3'
subst_dict = { }
@@ -365,8 +365,8 @@ if env['VST']:
answer = sys.stdin.readline ()
answer = answer.rstrip().strip()
if answer != "yes" and answer != "y":
print 'You cannot build Ardour with VST support for distribution to others.\nIt is a violation of several different licenses. VST support disabled.'
env['VST'] = 0;
print 'You cannot build Ardour with VST support for distribution to others.\nIt is a violation of several different licenses. Build with VST=false.'
sys.exit (-1);
else:
print "OK, VST support will be enabled"
@@ -680,9 +680,15 @@ if os.environ.has_key('DISTCC_HOSTS'):
env['ENV']['HOME'] = os.environ['HOME']
final_prefix = '$PREFIX'
install_prefix = '$DESTDIR/$PREFIX'
subst_dict['INSTALL_PREFIX'] = install_prefix;
if env['DESTDIR'] :
install_prefix = '$DESTDIR/$PREFIX'
else:
install_prefix = env['PREFIX']
subst_dict['%INSTALL_PREFIX%'] = install_prefix;
subst_dict['%FINAL_PREFIX%'] = final_prefix;
subst_dict['%PREFIX%'] = final_prefix;
if env['PREFIX'] == '/usr':
final_config_prefix = '/etc'
@@ -691,7 +697,6 @@ else:
config_prefix = '$DESTDIR' + final_config_prefix
# SCons should really do this for us
conf = Configure (env)