From 369fb3251908b16a3c2ce64ed4933fa627c6deaa Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 14 Apr 2002 15:07:16 +0000 Subject: Find the canna-lib headers and libraries in ${X11PREFIX} instead of ${PREFIX}, as canna-lib is USE_X11BASE. --- editors/ng/distinfo | 4 ++-- editors/ng/patches/patch-aa | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'editors') diff --git a/editors/ng/distinfo b/editors/ng/distinfo index 7041c7d1eb4..a8061bd2671 100644 --- a/editors/ng/distinfo +++ b/editors/ng/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:01:03 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/14 15:07:16 jlam Exp $ SHA1 (ng-1.4.3.tar.gz) = b5200da6c41f0e4d1d232a1a0c9548f8a37a96e2 Size (ng-1.4.3.tar.gz) = 586587 bytes -SHA1 (patch-aa) = bae8b0302e29fb5fb828207616b69c8faa8bc3f0 +SHA1 (patch-aa) = c7a0417f222b5fbfd5664ebce5ed33bd11a532de diff --git a/editors/ng/patches/patch-aa b/editors/ng/patches/patch-aa index c0d1220b9c6..711af363784 100644 --- a/editors/ng/patches/patch-aa +++ b/editors/ng/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2001/03/18 01:16:51 jun Exp $ +$NetBSD: patch-aa,v 1.4 2002/04/14 15:07:18 jlam Exp $ --- sys/bsd/Makefile.orig Sun Oct 1 00:59:42 2000 +++ sys/bsd/Makefile Thu Feb 15 18:28:30 2001 @@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.3 2001/03/18 01:16:51 jun Exp $ -#CANNAINC = -I/usr/pkg/include +.if ${USE_CANNA} == "YES" +CANNADEF = -DCANNA -+CANNALIB = -Wl,-R${PREFIX}/lib -L${PREFIX}/lib -lcanna -+CANNAINC = -I${PREFIX}/include ++CANNALIB = -Wl,-R${X11PREFIX}/lib -L${X11PREFIX}/lib -lcanna ++CANNAINC = -I${X11PREFIX}/include +.else CANNADEF = CANNALIB = -- cgit v1.2.3