diff options
author | jlam <jlam@pkgsrc.org> | 2004-03-30 16:19:51 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-03-30 16:19:51 +0000 |
commit | 9b22ee7e7d45cce1ffea1953a5ea9fc11df3ca19 (patch) | |
tree | 36084b830ea1a010962bcf87977db51a14329eee | |
parent | 565b44de256ea5534717156ca4f3fa191e7c32fa (diff) | |
download | pkgsrc-9b22ee7e7d45cce1ffea1953a5ea9fc11df3ca19.tar.gz |
Always pass the location of the db[34] headers since we install them in a
non-standard location. Also match the new USE_DB185 behaviour where it
defaults to "yes".
-rw-r--r-- | databases/db3/buildlink3.mk | 5 | ||||
-rw-r--r-- | databases/db4/buildlink3.mk | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk index 0d2e4de91b9..61e57020339 100644 --- a/databases/db3/buildlink3.mk +++ b/databases/db3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2004/03/22 18:18:26 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2004/03/30 16:19:51 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB3_BUILDLINK3_MK:= ${DB3_BUILDLINK3_MK}+ @@ -15,9 +15,10 @@ BUILDLINK_PACKAGES+= db3 .if !empty(DB3_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.db3+= db3>=2.9.2 BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 -. if defined(USE_DB185) BUILDLINK_INCDIRS.db3?= include/db3 BUILDLINK_TRANSFORM+= l:db-3:db3 +USE_DB185?= yes +. !empty(USE_DB185:M[yY][eE][sS]) BUILDLINK_TRANSFORM+= l:db:db3 . endif .endif # DB3_BUILDLINK3_MK diff --git a/databases/db4/buildlink3.mk b/databases/db4/buildlink3.mk index a8117f8ddd6..fb0e1cdbda5 100644 --- a/databases/db4/buildlink3.mk +++ b/databases/db4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2004/03/22 18:18:26 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2004/03/30 16:20:19 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ DB4_BUILDLINK3_MK:= ${DB4_BUILDLINK3_MK}+ @@ -15,13 +15,14 @@ BUILDLINK_PACKAGES+= db4 .if !empty(DB4_BUILDLINK3_MK:M+) BUILDLINK_DEPENDS.db4+= db4>=4.2.52 BUILDLINK_PKGSRCDIR.db4?= ../../databases/db4 -. if defined(USE_DB185) +BUILDLINK_INCDIRS.db4?= include/db4 +BUILDLINK_TRANSFORM+= l:db-4:db4 +USE_DB185?= yes +. if !empty(USE_DB185:M[yY][eE][sS]) # # Older db4 packages didn't enable the db-1.85 compatibility API. # BUILDLINK_DEPENDS.db4+= db4>=4.2.52nb1 -BUILDLINK_INCDIRS.db4?= include/db4 -BUILDLINK_TRANSFORM+= l:db-4:db4 BUILDLINK_TRANSFORM+= l:db:db4 . endif .endif # DB4_BUILDLINK3_MK |