Update of /cvsroot/pure-data/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30717
Modified Files: Tag: devel_0_39 SConstruct Log Message: fixes for MSVC
Index: SConstruct =================================================================== RCS file: /cvsroot/pure-data/pd/Attic/SConstruct,v retrieving revision 1.1.4.10 retrieving revision 1.1.4.11 diff -C2 -d -r1.1.4.10 -r1.1.4.11 *** SConstruct 28 Jul 2006 14:59:11 -0000 1.1.4.10 --- SConstruct 1 Aug 2006 13:25:26 -0000 1.1.4.11 *************** *** 56,59 **** --- 56,64 ---- prefix = env['prefix']
+ try: + app_pkg = env['app_pkg'] + except: + app_pkg = None + installs = []
*************** *** 61,70 **** installs.append(env.Install(prefix+'/bin', pdreceive)) installs.append(env.Install(prefix+'/bin', pd)) ! if not env['app_pkg']: installs.append(env.Install(prefix+'/lib/pd/bin', pdgui)) else: installs.append(env.Install(prefix+'/bin', pdgui)) if env['PLATFORM']=='posix': ! if env['app_pkg']: installs.append(env.Install(prefix+'/lib/pd/bin', pdwatchdog)) else: --- 66,75 ---- installs.append(env.Install(prefix+'/bin', pdreceive)) installs.append(env.Install(prefix+'/bin', pd)) ! if not app_pkg: installs.append(env.Install(prefix+'/lib/pd/bin', pdgui)) else: installs.append(env.Install(prefix+'/bin', pdgui)) if env['PLATFORM']=='posix': ! if app_pkg: installs.append(env.Install(prefix+'/lib/pd/bin', pdwatchdog)) else: *************** *** 73,77 **** if env['desire']: installs.append(env.InstallAs(prefix + '/bin/desire', 'src/desire.tk')) ! if env['app_pkg']: installs.append(env.InstallAs(prefix + '/lib/pd/bin/objective.tcl','src/objective.tcl')) installs.append(env.InstallAs(prefix + '/lib/pd/bin/pre8.5.tcl', 'src/pre8.5.tcl')) --- 78,82 ---- if env['desire']: installs.append(env.InstallAs(prefix + '/bin/desire', 'src/desire.tk')) ! if app_pkg: installs.append(env.InstallAs(prefix + '/lib/pd/bin/objective.tcl','src/objective.tcl')) installs.append(env.InstallAs(prefix + '/lib/pd/bin/pre8.5.tcl', 'src/pre8.5.tcl')) *************** *** 80,89 **** installs.append(env.InstallAs(prefix + '/Scripts/pre8.5.tcl', 'src/pre8.5.tcl')) else: ! if not env['app_pkg']: installs.append(env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk')) else: installs.append(env.InstallAs(prefix + '/bin/pd.tk','src/u_main.tk'))
! if not env['app_pkg']: for extra in extras: installs.append(env.Install(prefix+'/lib/extra/', extra)) --- 85,94 ---- installs.append(env.InstallAs(prefix + '/Scripts/pre8.5.tcl', 'src/pre8.5.tcl')) else: ! if not app_pkg: installs.append(env.InstallAs(prefix + '/lib/pd/bin/pd.tk','src/u_main.tk')) else: installs.append(env.InstallAs(prefix + '/bin/pd.tk','src/u_main.tk'))
! if not app_pkg: for extra in extras: installs.append(env.Install(prefix+'/lib/extra/', extra))