summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-07-14 05:55:18 +0000
committerjlam <jlam@pkgsrc.org>2001-07-14 05:55:18 +0000
commit4cb33d6d212abefaf2ad3009071894ce83a938ad (patch)
tree5ba273ee8d9ca5ad1d9b68c369505e87275ac6e1
parente1fc034a8cf4df9e5e08d11a6e53ecfc8c37b31c (diff)
downloadpkgsrc-4cb33d6d212abefaf2ad3009071894ce83a938ad.tar.gz
Move inclusion of buildlink.mk files to end of Makefile and remove
commented-out USE_LIBINTL.
-rw-r--r--pkgtools/rpm2pkg/Makefile15
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index bc422b79bfd..7cc5b794d91 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/06/18 21:32:24 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2001/07/14 05:55:18 jlam Exp $
DISTNAME= rpm2pkg-1.2
CATEGORIES= pkgtools
@@ -11,15 +11,9 @@ COMMENT= Convert RPM archives to NetBSD packages
CONFLICTS+= suse-base<=6.4
-NO_CHECKSUM= YES
-WRKSRC= ${WRKDIR}
-
-.include "../../devel/gettext-lib/buildlink.mk"
-.include "../../devel/zlib/buildlink.mk"
-.include "../../misc/rpm/buildlink.mk"
-
USE_BUILDLINK_ONLY= YES
-#USE_LIBINTL= YES
+NO_CHECKSUM= YES
+WRKSRC= ${WRKDIR}
RPMLIB= ${BUILDLINK_DIR}/lib/librpm.a
@@ -34,4 +28,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/rpm2pkg ${PREFIX}/sbin
${INSTALL_MAN} ${FILESDIR}/rpm2pkg.8 ${PREFIX}/man/man8
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/zlib/buildlink.mk"
+.include "../../misc/rpm/buildlink.mk"
.include "../../mk/bsd.pkg.mk"