From c624dc4a95eae48c8e421a660f92ee948b4be567 Mon Sep 17 00:00:00 2001 From: jlam Date: Sun, 20 Oct 2002 23:23:53 +0000 Subject: Use BUILDLINK_CPPFLAGS.rpm and rely on buildlink2 to make "-lrpm" resolve to the correct library. --- pkgtools/rpm2pkg/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pkgtools/rpm2pkg') diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 93d0d4f5257..e2a6f31c357 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/09/19 02:46:07 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2002/10/20 23:23:53 jlam Exp $ DISTNAME= rpm2pkg-1.2 CATEGORIES= pkgtools @@ -15,10 +15,8 @@ USE_BUILDLINK2= YES NO_CHECKSUM= YES WRKSRC= ${WRKDIR} -RPMLIB= ${BUILDLINK_PREFIX.rpm}/lib/librpm.a - -CFLAGS+= -I${BUILDLINK_PREFIX.rpm}/include/rpm -LIBS= ${RPMLIB} -lintl -lz +CFLAGS+= ${BUILDLINK_CPPFLAGS.rpm} +LIBS= -lrpm -lintl -lz do-build: ${BUILDLINK_CC} ${CFLAGS} ${LDFLAGS} -o ${WRKSRC}/rpm2pkg \ -- cgit v1.2.3