summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-01-04 23:46:39 +0000
committerjlam <jlam@pkgsrc.org>2004-01-04 23:46:39 +0000
commitec57e785948f02fdafc0a63409e816bd158715ef (patch)
tree8ce2dee2775cc710adacddc3e2889612338a3c6c
parent47bb2aae5fa611de979ba5561333a21d25235227 (diff)
downloadpkgsrc-ec57e785948f02fdafc0a63409e816bd158715ef.tar.gz
Use BUILDLINK_{INCDIRS,LIBDIRS}.<pkg> instead of
BUILDLINK_{CPPFLAGS,LDFLAGS}.<pkg> where we're adding search directories. Using the former should do the right thing for pkgviews if we do binary package upgrades of dependencies by inserting the right default view directories into the search path as well.
-rw-r--r--databases/db4/buildlink3.mk4
-rw-r--r--databases/mysql-client/buildlink3.mk6
2 files changed, 4 insertions, 6 deletions
diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk
index 6c49ff3ea93..7956bab5af2 100644
--- a/databases/db4/buildlink3.mk
+++ b/databases/db4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/04 23:46:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_DEPENDS+= db4
BUILDLINK_PACKAGES+= db4
BUILDLINK_DEPENDS.db4?= db4>=4.1.25
BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4
-BUILDLINK_CPPFLAGS.db4?= -I${BUILDLINK_PREFIX.db4}/include/db4
+BUILDLINK_INCDIRS.db4?= include/db4
.endif # DB4_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:C/\+$//}
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index da13371341b..6685b16288a 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/01/04 23:34:05 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2004/01/04 23:46:39 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
MYSQL_CLIENT_BUILDLINK3_MK:= ${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -11,9 +11,7 @@ BUILDLINK_DEPENDS+= mysql-client
BUILDLINK_PACKAGES+= mysql-client
BUILDLINK_DEPENDS.mysql-client?= mysql-client>=3.23.58
BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mysql-client
-BUILDLINK_LDFLAGS.mysql-client?= \
- -L${BUILDLINK_PREFIX.mysql-client}/lib/mysql \
- -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.mysql-client}/lib/mysql
+BUILDLINK_LIBDIRS.mysql-client?= lib/mysql
. include "../../devel/zlib/buildlink3.mk"
.endif # MYSQL_CLIENT_BUILDLINK3_MK