From 892398c04ce61dbd54e98ec251f37d2e1d60aa53 Mon Sep 17 00:00:00 2001 From: joerg Date: Thu, 11 Dec 2014 22:13:08 +0000 Subject: Replace rename with l to work with both old and new wrappers. --- misc/rpm/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'misc/rpm') diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile index 70af5f40594..4d145770ee6 100644 --- a/misc/rpm/Makefile +++ b/misc/rpm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2014/08/08 15:00:54 dholland Exp $ +# $NetBSD: Makefile,v 1.84 2014/12/11 22:13:08 joerg Exp $ DISTNAME= rpm-4.11.1 PKGREVISION= 2 @@ -37,12 +37,15 @@ CONFIGURE_ARGS+= --without-lua CONFIGURE_ARGS+= --with-external-db BDB_ACCEPTED= db4 db5 - +.include "../../mk/bdb.buildlink3.mk" +.if ${BDB_TYPE} == "db4" +BUILDLINK_TRANSFORM+= l:db:db4 +.else +BUILDLINK_TRANSFORM+= l:db:db5 +.endif # The rpm databases are kept under ${RPM_DB_PREFIX}/lib/rpm. CONFIGURE_ENV+= varprefix=${RPM_DB_PREFIX:Q} -# Needs help finding bdb. -BUILDLINK_TRANSFORM+= rename:-ldb:${BDB_LIBS} LDFLAGS+= ${PTHREAD_LDFLAGS} MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man8 @@ -82,5 +85,4 @@ SUBST_SED.mkd+= -e 's,${TOOLS_CMD.mkdir},${TOOLS_PATH.mkdir},' .include "../../devel/zlib/buildlink3.mk" .include "../../sysutils/file/buildlink3.mk" # for libmagic. -.include "../../mk/bdb.buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3