--- ray/src/hd/Rmakefile	2008/05/12 16:46:46	3.33
+++ ray/src/hd/Rmakefile	2023/02/09 00:18:05	3.38
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 3.33 2008/05/12 16:46:46 greg Exp $
+# RCSid: $Id: Rmakefile,v 3.38 2023/02/09 00:18:05 greg Exp $
 #
 # Radiance makefile for holodeck programs
 #
@@ -17,8 +17,10 @@ LN = ln
 
 SPECIAL =
 
+INSTALL = cp
+
 INSTDIR = /usr/local/bin
-DEVDIR = $(INSTDIR)/dev
+DEVDIR = $(INSTDIR)
 
 LIBDIR = /usr/local/lib/ray
 
@@ -29,10 +31,10 @@ DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
 all:	$(PROGS)
 
 install:	all $(DEVS) $(SPECIAL)
-	cp $(PROGS) $(INSTDIR)
+	$(INSTALL) $(PROGS) $(INSTDIR)
 
 clean:
-	set nonomatch; rm -f *.o $(PROGS) core Version.c
+	set nonomatch; rm -f *.o $(PROGS) Version.c
 
 ogl:	$(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \
 	$(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi \
@@ -142,20 +144,16 @@ viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
 -lrgl -lrtrad -lGLU -lGL -lX11 -lXext $(MLIB)
 
 rhd_ogl0.o:	rhd_ogl.c
-	$(CC) $(CFLAGS) -c rhd_ogl.c
-	mv -f rhd_ogl.o rhd_ogl0.o
+	$(CC) $(CFLAGS) -o rhd_ogl0.o -c rhd_ogl.c
 
 rhd_oglo.o:	rhd_ogl.c
-	$(CC) $(CFLAGS) -DDOBJ -c rhd_ogl.c
-	mv -f rhd_ogl.o rhd_oglo.o
+	$(CC) $(CFLAGS) -DDOBJ -o rhd_oglo.o -c rhd_ogl.c
 
 rhd_ogls.o:	rhd_ogl.c
-	$(CC) $(CFLAGS) -DSTEREO -c rhd_ogl.c
-	mv -f rhd_ogl.o rhd_ogls.o
+	$(CC) $(CFLAGS) -DSTEREO -o rhd_ogls.o -c rhd_ogl.c
 
 rhd_oglso.o:	rhd_ogl.c
-	$(CC) $(CFLAGS) -DDOBJ -DSTEREO -c rhd_ogl.c
-	mv -f rhd_ogl.o rhd_oglso.o
+	$(CC) $(CFLAGS) -DDOBJ -DSTEREO -o rhd_oglso.o -c rhd_ogl.c
 
 rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
 rhdisp.o rhdisp2.o rhpict.o viewbeams.o:	rholo.h
@@ -178,7 +176,7 @@ rhinfo.o clumpbeams.o rhoptimize.o rhpict.o rhpict2.o:
 ../common/vars.h ../common/color.h \
 ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
-../common/rterror.h ../common/tifftypes.h
+../common/rterror.h
 
 rhcopy.o:	../common/resolu.h ../common/view.h