68a16da69a
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++.
35 lines
1.1 KiB
Text
35 lines
1.1 KiB
Text
$NetBSD: patch-ai,v 1.4 2009/04/29 05:15:14 dholland Exp $
|
|
|
|
--- src/meta/Rmakefile.orig 2003-10-21 22:15:07.000000000 -0400
|
|
+++ src/meta/Rmakefile 2005-02-16 18:10:01.000000000 -0500
|
|
@@ -5,14 +5,13 @@
|
|
|
|
OPT = -O
|
|
MACH =
|
|
-CC = cc
|
|
MLIB = -lm
|
|
-CFLAGS = -DMDIR=\"$(MLIBDIR)/\" $(OPT) $(MACH) -I../common -L../lib
|
|
+CFLAGS += -DMDIR=\"@PREFIX@/radiance/lib/meta/\" $(OPT) $(MACH) -I../common -L../lib ${LDFLAGS}
|
|
|
|
-LIBDIR = /usr/local/lib
|
|
+LIBDIR = @WRKSRC@/radiance/lib
|
|
MLIBDIR = $(LIBDIR)/meta
|
|
DESTDIR = .
|
|
-INSTDIR = /usr/local/bin
|
|
+INSTDIR = @WRKSRC@/radiance/bin
|
|
|
|
# target lists
|
|
common = mfio.o syscalls.o misc.o
|
|
@@ -127,10 +126,10 @@
|
|
../lib/libmeta.a: metacalls.o primout.o progname.o
|
|
ar rc ../lib/libmeta.a metacalls.o primout.o \
|
|
$(common) progname.o
|
|
- -ranlib ../lib/libmeta.a
|
|
+ -${RANLIB} ../lib/libmeta.a
|
|
|
|
../lib/lib4014.a:
|
|
- cd lib4014; make INSTDIR=../../lib "CFLAGS=$(OPT)" install clean
|
|
+ cd lib4014; $(MAKE) INSTDIR=../../lib install clean
|
|
|
|
$(DESTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a
|
|
$(CC) $(CFLAGS) -o bgraph bgraph.o mgvars.o mgraph.o \
|