--- ray/src/util/Rmakefile	1994/11/04 17:40:46	2.13
+++ ray/src/util/Rmakefile	1995/10/26 18:50:41	2.17
@@ -15,36 +15,25 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = findglare xglaresrc glarendx rpiece rad
+PROGS = findglare xglaresrc glarendx rpiece rad vwright
 
-TLIBFILES = do_action.tcl do_file.tcl do_options.tcl do_results.tcl \
-		do_scene.tcl do_views.tcl do_zone.tcl \
-		getfile.tcl gethelp.tcl util.tcl tclIndex \
-		trad.hlp help.hlp file.hlp trad.icon
-
 all:	$(PROGS)
 
 install:	all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
-raddepend.csh ivprep.csh ivpict.csh trad.wsh
+raddepend.csh trad.wsh objline.csh
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
+	cp objline.csh $(INSTDIR)/objline
 	cp objpict.csh $(INSTDIR)/objpict
 	cp glare.csh $(INSTDIR)/glare
 	cp dayfact.csh $(INSTDIR)/dayfact
 	cp debugcal.csh $(INSTDIR)/debugcal
 	cp rlux.csh $(INSTDIR)/rlux
 	cp raddepend.csh $(INSTDIR)/raddepend
-	cp ivprep.csh $(INSTDIR)/ivprep
-	cp ivpict.csh $(INSTDIR)/ivpict
-	sed -e "1s|/usr/local/bin/wish|`which wish`|" \
-		-e "s|^set radlib .*|set radlib $(LIBDIR)/tcl|" \
-		trad.wsh > $(INSTDIR)/trad
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
 		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
-		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/ivprep \
-		$(INSTDIR)/ivpict $(INSTDIR)/trad
-	cd $(LIBDIR)/tcl ; rm -f $(TLIBFILES)
-	cp $(TLIBFILES) $(LIBDIR)/tcl
+		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline
+	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
 	set nonomatch; rm -f *.o $(PROGS) core
@@ -71,6 +60,9 @@ rad:	rad.o
 
 rpiece:	rpiece.o Version.o
 	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
+
+vwright:	vwright.o
+	$(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
 
 contour:	contour.o
 	$(CC) $(CFLAGS) -o contour contour.o -lm