--- ray/SConstruct	2003/10/27 10:35:41	1.2
+++ ray/SConstruct	2005/02/10 16:42:04	1.6
@@ -4,7 +4,7 @@ import sys
 import string
 
 OPTFILE = 'rayopts.py'
-
+SourceSignatures('timestamp')
 def set_opts(env):
     # XXX add some caching
     opts = Options(OPTFILE, ARGUMENTS)
@@ -26,7 +26,6 @@ def allplats_setup(env):
     from build_utils import find_libs
     find_libs.find_x11(env)
     find_libs.find_gl(env) # OpenGL
-    #find_libs.find_pixar(env) # PIXAR_LIB for src/px/ra_pixar.c
 
 def post_common_setup(env):
     env.Append(CPPPATH = [os.path.join('#src', 'common')])
@@ -45,6 +44,12 @@ def shareinstall_setup(env):
 # Set up build environment
 env = Environment()
 
+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})
+
 # configure platform-specific stuff
 from build_utils import load_plat
 load_plat.load_plat(env, ARGUMENTS, platform=None)
@@ -60,36 +65,27 @@ if not env['SKIP'] and not '-c' in sys.argv:
 # fill in generic config
 allplats_setup(env)
 
+		
+
 # Bring in all the actual things to build
 Export('env')
 SConscript(os.path.join('src', 'common', 'SConscript'))
 post_common_setup(env)
 for d in Split('meta cv gen ot rt px hd util cal'):
+    print d
     SConscript(os.path.join('src', d, 'SConscript'))
 
 if string.find(string.join(sys.argv[1:]), 'install') > -1:
 	shareinstall_setup(env)
 
+Default('.')
+
 # virtual targets
-# RAD_XXXINSTALL are filled in by the local scripts
-env.Alias('bininstall',  env.get('RAD_BININSTALL', []))
-env.Alias('rlibinstall', env.get('RAD_RLIBINSTALL',[]))
-env.Alias('maninstall',  env.get('RAD_MANINSTALL', []))
+env.Alias('bininstall',  '$RAD_BINDIR')
+env.Alias('rlibinstall', '$RAD_RLIBDIR')
+env.Alias('maninstall',  '$RAD_MANDIR')
 
 env.Alias('build',   ['#bin'])
 env.Alias('test',    ['#src/test'])
 env.Alias('install', ['bininstall', 'rlibinstall', 'maninstall'])
-
-# Further virtual targets are defined locally:
-
-# meta_special -> mt1601 okimate imagew mt160 mx80 impress aed5
-#                 tcurve tscat tbar mtext libt4014.a plotout t4014
-# meta_special_install
-
-# px_special   -> ra_im, t4027, paintjet, mt160t, greyscale, colorscale, d48c
-# px_special_install
-
-# util_special -> scanner, makedist (not for Windows yet)
-# util_special_install
-