--- ray/src/util/Rmakefile	1991/07/15 12:52:25	1.12
+++ ray/src/util/Rmakefile	1991/10/24 17:20:18	1.15
@@ -2,15 +2,15 @@
 # SCCSid "$SunId$ LBL"
 #
 
-MACH = -f68881 /usr/lib/libm.il -DIEEE -DBSD -DSTRUCTASSIGN
+MACH = -DBSD -DSTRUCTASSIGN
 
 OPT = -O
 
-CFLAGS = $(MACH) $(OPT) -I../common
+CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+INSTDIR = /usr/local/bin
 
-PROGS = makedist swaprasheader findglare xglaresrc glarendx
+PROGS = findglare xglaresrc glarendx
 
 all:	$(PROGS)
 
@@ -20,8 +20,9 @@ install:	all objview.csh objpict.csh proj.csh glare.cs
 	cp objpict.csh $(INSTDIR)/objpict
 	cp glare.csh $(INSTDIR)/glare
 	cp dayfact.csh $(INSTDIR)/dayfact
+	cp debugcal.csh $(INSTDIR)/debugcal
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
-		$(INSTDIR)/glare $(INSTDIR)/dayfact
+		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal
 
 clean:
 	set nonomatch; rm -f *.o $(PROGS) core
@@ -30,18 +31,18 @@ scanner:	scanner.o
 	cc $(CFLAGS) -o scanner scanner.o -lm
 
 makedist:	makedist.o setscan.o
-	cc $(CFLAGS) -o makedist makedist.o setscan.o ../common/librt.a -lm
+	cc $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
 
 findglare:	findglare.o glareval.o glaresrc.o setscan.o
 	cc $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
-setscan.o ../common/librt.a -lm
+setscan.o -lrt -lm
 
 glarendx:	glarendx.o
-	cc $(CFLAGS) -o glarendx glarendx.o ../common/librt.a -lm
+	cc $(CFLAGS) -o glarendx glarendx.o -lrt -lm
 
 xglaresrc:	xglaresrc.o x11findwind.o
 	cc $(CFLAGS) -o xglaresrc xglaresrc.o \
-x11findwind.o ../common/librt.a -lm -lX11
+x11findwind.o -lrt -lX11 -lm
 
 contour:	contour.o
 	cc $(CFLAGS) -o contour contour.o -lm