$NetBSD: patch-al,v 1.5 2011/11/14 02:35:25 dholland Exp $ --- src/rt/Rmakefile.orig 2004-10-27 23:23:48.000000000 +0000 +++ src/rt/Rmakefile @@ -5,9 +5,8 @@ OPT = -O MACH = -DBSD -CFLAGS = -I../common -L../lib $(OPT) $(MACH) +CFLAGS += -I../common -L../lib $(OPT) $(MACH) ${LDFLAGS} SPECIAL = aed -CC = cc MLIB = -lm LINT = lint LINTFLAGS = -DBSD @@ -16,21 +15,21 @@ LINTFLAGS = -DBSD # The following are user-definable: # DESTDIR = . -INSTDIR = /usr/local/bin +INSTDIR = @WRKSRC@/radiance/bin INSTALL = cp # # The following paths must exist and be relative to root: # -DEVDIR = $(INSTDIR)/dev -LIBDIR = /usr/local/lib/ray +DEVDIR = @WRKSRC@/radiance/dev +LIBDIR = @WRKSRC@/radiance/lib # # Library routines: # RLIB = ../lib/libradiance.a RCLIB = ../lib/libraycalls.a -LIBS = -lrt $(MLIB) +LIBS = -lrt $(MLIB) ${LDFLAGS} # # Device drivers for rvu (see also devtable.c): @@ -130,12 +129,12 @@ $(DEVDIR)/aed: aed.o colortab.o tty.o de devmain.o tty.o editline.o $(LIBS) $(RLIB): $(ROBJS) Version.o - ar rc $(RLIB) $(ROBJS) Version.o - -ranlib $(RLIB) + ${AR} rc $(RLIB) $(ROBJS) Version.o + -${RANLIB} $(RLIB) $(RCLIB): $(RLOBJS) - ar rc $(RCLIB) $(RLOBJS) - -ranlib $(RCLIB) + ${AR} rc $(RCLIB) $(RLOBJS) + -${RANLIB} $(RCLIB) # # Special compiles: @@ -159,7 +158,7 @@ dielectric.o: dielectric.c source.h # end of dispersion compiles. devcomm.o: devcomm.c - $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c + $(CC) $(CFLAGS) -DDEVPATH=\"@PREFIX@/radiance/dev\" -c devcomm.c aed.o: aed.c $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c @@ -168,9 +167,9 @@ aed.o: aed.c # Version module: # -Version.c: VERSION $(RSRC) $(HEADERS) - ( cat VERSION ; date ; whoami ; hostname ) > Version.c - ed - Version.c < verscript.ed +#Version.c: VERSION $(RSRC) $(HEADERS) +# ( cat VERSION ; date ; whoami ; hostname ) > Version.c +# ed - Version.c < verscript.ed # # Include dependencies: