diff options
| author | abs <abs> | 2002-08-23 14:27:14 +0000 |
|---|---|---|
| committer | abs <abs> | 2002-08-23 14:27:14 +0000 |
| commit | 1241eb62503899f74b5edd91d3727a9c8a74746c (patch) | |
| tree | 849f34489f3b110b75d56cdd6bb1300c38f21c46 /pkgtools/rpm2pkg | |
| parent | b81e1a677d0fa71f0f995e4b9c48a1178dc64dea (diff) | |
| download | pkgsrc-1241eb62503899f74b5edd91d3727a9c8a74746c.tar.gz | |
revert buildlink2.mk merge until Johnny has a chance to look at the issues
Diffstat (limited to 'pkgtools/rpm2pkg')
| -rw-r--r-- | pkgtools/rpm2pkg/Makefile | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile index 3578ebd465e..3bd235fe95f 100644 --- a/pkgtools/rpm2pkg/Makefile +++ b/pkgtools/rpm2pkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/08/23 05:22:56 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/08/23 14:28:43 abs Exp $ DISTNAME= rpm2pkg-1.2 CATEGORIES= pkgtools @@ -11,9 +11,9 @@ COMMENT= Convert RPM archives to NetBSD packages CONFLICTS+= suse-base<=6.4 -USE_BUILDLINK2= YES -NO_CHECKSUM= YES -WRKSRC= ${WRKDIR} +USE_BUILDLINK_ONLY= YES +NO_CHECKSUM= YES +WRKSRC= ${WRKDIR} RPMLIB= ${BUILDLINK_DIR}/lib/librpm.a @@ -21,14 +21,13 @@ CFLAGS+= -I${BUILDLINK_DIR}/include/rpm LIBS= ${RPMLIB} -lintl -lz do-build: - ${BUILDLINK_CC} ${FILESDIR}/rpm2pkg.c \ - ${CFLAGS} ${LDFLAGS} ${LIBS} -o ${WRKSRC}/rpm2pkg + ${CC} ${FILESDIR}/rpm2pkg.c ${CFLAGS} ${LDFLAGS} ${LIBS} \ + -o ${WRKSRC}/rpm2pkg do-install: ${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${PREFIX}/sbin ${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 ${PREFIX}/man/man8 -.include "../../devel/zlib/buildlink2.mk" -.include "../../misc/rpm/buildlink2.mk" - +.include "../../devel/zlib/buildlink.mk" +.include "../../misc/rpm/buildlink.mk" .include "../../mk/bsd.pkg.mk" |