diff options
| author | jlam <jlam@pkgsrc.org> | 2006-07-14 20:11:10 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-07-14 20:11:10 +0000 |
| commit | bc22bd5d447c4f278d213bb2c5ee8f0bc50fd9eb (patch) | |
| tree | a89d317025aa6a5f5627ace6d1986ef3a79228e5 /pkgtools | |
| parent | a7ad4c977afe151b74b7dcbcaae6d85e29c368ed (diff) | |
| download | pkgsrc-bc22bd5d447c4f278d213bb2c5ee8f0bc50fd9eb.tar.gz | |
For the pkgtools versions of mtree and pax, always use libnbcompat
"in-place", and for the normal versions of mtree and pax, always use
libnbcompat as a normal build dependency.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/mtree/Makefile | 3 | ||||
| -rw-r--r-- | pkgtools/mtree/Makefile.common | 8 | ||||
| -rw-r--r-- | pkgtools/pax/Makefile | 3 |
3 files changed, 5 insertions, 9 deletions
diff --git a/pkgtools/mtree/Makefile b/pkgtools/mtree/Makefile index bd5df09d2a7..2a9939ee02a 100644 --- a/pkgtools/mtree/Makefile +++ b/pkgtools/mtree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2006/07/14 19:54:47 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2006/07/14 20:11:10 jlam Exp $ # # This version of mtree installs into ${PKG_TOOLS_BIN}. # @@ -19,6 +19,7 @@ PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} PKGMANDIR= share/man .endif +.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" PREFIX:= ${PKG_TOOLS_PREFIX} diff --git a/pkgtools/mtree/Makefile.common b/pkgtools/mtree/Makefile.common index 88c5f693abb..7248ac5362e 100644 --- a/pkgtools/mtree/Makefile.common +++ b/pkgtools/mtree/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2006/07/14 19:54:47 jlam Exp $# +# $NetBSD: Makefile.common,v 1.2 2006/07/14 20:11:10 jlam Exp $# # # This Makefile fragment is included by: # @@ -24,11 +24,5 @@ PKGDIR= ${.CURDIR}/../../pkgtools/mtree .include "../../mk/bsd.prefs.mk" -.if defined(LIBNBCOMPAT_STYLE) && (${LIBNBCOMPAT_STYLE} == "inplace") -. include "../../pkgtools/libnbcompat/inplace.mk" -.else -. include "../../pkgtools/libnbcompat/buildlink3.mk" -.endif - do-extract: @${CP} -R ${FILESDIR} ${WRKSRC} diff --git a/pkgtools/pax/Makefile b/pkgtools/pax/Makefile index 22c77ff9e89..3d780b96921 100644 --- a/pkgtools/pax/Makefile +++ b/pkgtools/pax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/07/14 19:45:12 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2006/07/14 20:11:10 jlam Exp $ # # This version of pax installs into ${PKG_TOOLS_BIN}. # @@ -19,6 +19,7 @@ PKG_TOOLS_PREFIX= ${PKG_TOOLS_BIN:C|/[^/]?bin$||} PKGMANDIR= share/man .endif +.include "../../pkgtools/libnbcompat/inplace.mk" .include "../../mk/bsd.pkg.mk" PREFIX:= ${PKG_TOOLS_PREFIX} |