$NetBSD: patch-af,v 1.1.1.1 2005/02/16 22:17:33 jschauma Exp $ --- src/cv/Rmakefile.orig 2004-10-27 19:36:09.000000000 -0400 +++ src/cv/Rmakefile 2005-02-15 15:31:38.000000000 -0500 @@ -7,16 +7,14 @@ MACH = -DBSD -CFLAGS = -I../common -L../lib $(OPT) $(MACH) +CFLAGS += -I../common -L../lib $(OPT) $(MACH) ${LDFLAGS} METACFLAGS = -I../meta -CC = cc - MLIB = -lm -INSTDIR = /usr/local/bin +INSTDIR = @WRKSRC@/radiance/bin -LIBDIR = /usr/local/lib/ray +LIBDIR = @WRKSRC@/radiance/lib MGF_LIB = ../lib/libmgf.a @@ -68,21 +66,18 @@ mgfilt: cd mgflib ; rm -f mgfilt ; \ - make mgfilt CC=$(CC) \ - CFLAGS="$(OPT) $(MACH)" ; \ - mv mgfilt .. + @MAKE@ mgfilt + mv mgflib/mgfilt . mgf2inv: cd mgflib ; rm -f mgf2inv ; \ - make mgf2inv CC=$(CC) \ - CFLAGS="$(OPT) $(MACH)" ; \ - mv mgf2inv .. + @MAKE@ mgf2inv + mv mgflib/mgf2inv . $(MGF_LIB): cd mgflib ; rm -f libmgf.a ; \ - make libmgf.a CC=$(CC) \ - CFLAGS="$(OPT) $(MACH)" ; \ - mv libmgf.a ../../lib + @MAKE@ libmgf.a + mv mgflib/libmgf.a ../lib mgf2rad.o: mgf2rad.c mgflib/parser.h ../common/tmesh.h ../common/color.h $(CC) $(CFLAGS) -c mgf2rad.c