--- ray/SConstruct	2008/12/26 17:00:32	1.8
+++ ray/SConstruct	2016/03/06 01:13:17	1.15
@@ -6,15 +6,15 @@ import string
 OPTFILE = 'rayopts.py'
 def set_opts(env):
 	# XXX add some caching
-	opts = Options(OPTFILE, ARGUMENTS)
-	opts.Add('SKIP', 'Skip Display of License terms', 0)
-	opts.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
-	opts.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
-	opts.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
-	opts.Add('RAD_DEBUG',   'Build a debug version',  0)
-	opts.Update(env) 
-	opts.Save(OPTFILE, env)
-	Help(opts.GenerateHelpText(env, sort=cmp))
+	vars = Variables(OPTFILE, ARGUMENTS)
+	vars.Add('SKIP', 'Skip Display of License terms', 0)
+	vars.Add('RAD_BINDIR',  'Install executables here',   env['RAD_BINDIR'])
+	vars.Add('RAD_RLIBDIR', 'Install support files here', env['RAD_RLIBDIR'])
+	vars.Add('RAD_MANDIR',  'Install man pages here',     env['RAD_MANDIR'])
+	vars.Add('RAD_DEBUG',   'Build a debug version',  0)
+	vars.Update(env) 
+	vars.Save(OPTFILE, env)
+	Help(vars.GenerateHelpText(env, sort=cmp))
 	# where stuff is located in the source tree
 	env['RAD_BUILDLIB']  = '#src/lib'
 	env['RAD_BUILDBIN']  = '#bin'
@@ -23,6 +23,7 @@ def set_opts(env):
 
 def allplats_setup(env):
 	from build_utils import find_libs
+	find_libs.find_radlib(env)
 	find_libs.find_x11(env)
 	find_libs.find_gl(env) # OpenGL
 	find_libs.find_libtiff(env)
@@ -47,13 +48,14 @@ env.Decider('timestamp-match')
 
 if os.name == 'posix':
 	from build_utils import install
-	csh_b = Builder(action = install.install_cshscript,
-			suffix = '', src_suffix = '.csh')
-	env.Append(BUILDERS={'InstallCsh': csh_b})
+	script_b = Builder(action = install.install_script, suffix = '')
+	env.Append(BUILDERS={'InstallScript': script_b})
+	tclscript_b = Builder(action = install.install_tclscript, suffix = '')
+	env.Append(BUILDERS={'InstallTCLScript': tclscript_b})
 
 # configure platform-specific stuff
 from build_utils import load_plat
-load_plat.load_plat(env, ARGUMENTS, platform=None)
+load_plat.load_plat(env, ARGUMENTS, ourplat=None)
 
 # override options
 set_opts(env)
@@ -68,7 +70,6 @@ if ((not env['SKIP']
 # fill in generic config
 allplats_setup(env)
 
-
 # Bring in all the actual things to build
 Export('env')
 if 'test' in sys.argv:
@@ -95,3 +96,4 @@ env.Alias('build',   ['#bin'])
 env.Alias('test',    ['#test'])
 env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])
 
+# vim: set syntax=python: