$NetBSD: patch-ae,v 1.4 2009/04/29 05:15:14 dholland Exp $

--- src/common/Rmakefile.orig	2004-10-27 19:36:09.000000000 -0400
+++ src/common/Rmakefile	2005-02-16 18:10:50.000000000 -0500
@@ -5,13 +5,12 @@
 
 OPT = -O
 MACH = -DBSD
-CFLAGS = $(MACH) $(OPT)
-CC = cc
+CFLAGS += $(MACH) $(OPT)
 SPECIAL =
 
 COMPAT = bmalloc.o erf.o strcmp.o # frexp.o fwrite.o random.o
 
-LIBDIR = /usr/local/lib/ray
+LIBDIR = @WRKSRC@/radiance/lib
 
 RTOBJ = cone.o face.o free_os.o instance.o readobj.o readoct.o otypes.o \
 	objset.o octree.o readfargs.o modobject.o getlibpath.o \
@@ -37,8 +36,8 @@
 all:	librt.a $(SPECIAL)
 
 librt.a:	$(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
-	ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
-	-ranlib librt.a
+	${AR} rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
+	-${RANLIB} librt.a
 	mv librt.a ../lib/librt.a
 
 install:	all
@@ -49,8 +48,8 @@
 	rm -f *.o librt.a
 
 ogl:	$(OGLOBJ)
-	ar rc librgl.a $(OGLOBJ)
-	-ranlib librgl.a
+	${AR} rc librgl.a $(OGLOBJ)
+	-${RANLIB} librgl.a
 	mv librgl.a ../lib/librgl.a
 
 x10:
@@ -62,7 +61,7 @@
 sun:
 
 getlibpath.o:	getlibpath.c
-	$(CC) $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c getlibpath.c
+	$(CC) $(CFLAGS) -DDEFPATH=\":@PREFIX@/radiance/lib\" -c getlibpath.c
 
 tmapcolrs.o:	tmapcolrs.c
 	$(CC) $(CFLAGS) -DPCOND=\"pcond\" -c tmapcolrs.c