3e6479e874
While here, clean up a lot of pkglint; it appears that the manual substitutions in the makefile got rolled into several of the patches at some point. Various problems remain (e.g. the build system runs /usr/bin/make explicitly in a number of places; plus the manual substitutions should be tidied away) but this should cover the most serious ones. PKGREVISION++.
67 lines
1.5 KiB
Text
67 lines
1.5 KiB
Text
$NetBSD: patch-al,v 1.4 2009/04/29 05:15:14 dholland Exp $
|
|
|
|
--- src/rt/Rmakefile.orig 2004-10-27 19:23:48.000000000 -0400
|
|
+++ src/rt/Rmakefile 2005-02-16 18:10:40.000000000 -0500
|
|
@@ -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 @@
|
|
# 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 @@
|
|
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 @@
|
|
# 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
|