$NetBSD: patch-ak,v 1.2 2006/04/28 16:55:10 joerg Exp $

--- src/px/Rmakefile.orig	2004-10-27 23:23:47.000000000 +0000
+++ src/px/Rmakefile
@@ -7,13 +7,12 @@ ARCH = sun
 OPT = -O
 MACH = -DBSD
 SPECIAL = aed
-CFLAGS = -I../common -L../lib $(OPT) $(MACH)
-CC = cc
+CFLAGS += -I../common -L../lib $(OPT) $(MACH) ${LDFLAGS}
 MLIB = -lm
 
-INSTDIR = /usr/local/bin
+INSTDIR = @WRKSRC@/radiance/bin
 
-LIBDIR = /usr/local/lib/ray
+LIBDIR = @WRKSRC@/radiance/lib
 
 PIXAR_INCLUDE=	-I/usr/pixar/include
 PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
@@ -55,7 +54,6 @@ pdfblur.csh pmblur.csh xyzimage.csh pgbl
 clean:
 	set nonomatch; rm -f x10image aedimage glimage \
 $(PROGS) $(SPECIAL) *.o core
-	-cd tiff; make distclean
 
 pfilt:	pfilt.o pf2.o pf3.o
 	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
@@ -186,21 +184,12 @@ pinterp:	pinterp.o
 ra_xyze:	ra_xyze.o
 	$(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
 
-ra_tiff:	ra_tiff.o ../lib/libtiff.a
+ra_tiff:	ra_tiff.o
 	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
 
-../common/tiff.h ../common/tiffio.h:	../lib/libtiff.a
-	@chmod u+w ../common/tiff.h ../common/tiffio.h
-	@touch ../common/tiff.h ../common/tiffio.h
-
-normtiff:	normtiff.o ../lib/libtiff.a
+normtiff:	normtiff.o
 	$(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
 
-../lib/libtiff.a:	tiff/config.local
-	cd tiff ; sh configure -quiet -noninteractive -with-CC=$(CC) \
-		"-with-ENVOPTS=$(OPT)" ; \
-	cd libtiff ; make install
-
 ra_pixar:	ra_pixar.o ra_pixar.c
 	$(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
 $(PIXAR_LIB)
@@ -244,7 +233,7 @@ neuclrtab.o pvalue.o protate.o biq.o ciq
 xshowtrace.o clrtab.o pcomb.o pfilt.o pf3.o image.o:	../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
 
 ximage.o xraster.o:	xraster.h
 
@@ -254,8 +243,6 @@ x11image.o:	../common/tonemap.h ../commo
 
 ra_t8.o:	../common/targa.h
 
-ra_tiff.o normtiff.o:	../common/tiff.h ../common/tiffio.h
-
 aedimage.o ximage.o ra_t8.o ra_pr.o:	pic.h
 
 ciq.o cut.o closest.o biq.o:	pic.h ciq.h
@@ -277,7 +264,7 @@ psign.o:	../common/font.h
 pcond.o pcond2.o pcond3.o pcond4.o:	pcond.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 \
 ../common/color.h ../common/view.h ../common/resolu.h
 
 normtiff.o:	../common/color.h ../common/tonemap.h ../common/resolu.h