diff options
| author | jlam <jlam> | 2006-07-14 20:11:10 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-14 20:11:10 +0000 |
| commit | 667f13dc9e9c0edcbc9bfd56a7c226a6f9b49e8e (patch) | |
| tree | a89d317025aa6a5f5627ace6d1986ef3a79228e5 /archivers | |
| parent | 8694e7cfebefaf5632d8fe172a02f0c74851fddb (diff) | |
| download | pkgsrc-667f13dc9e9c0edcbc9bfd56a7c226a6f9b49e8e.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 'archivers')
| -rw-r--r-- | archivers/pax/Makefile | 3 | ||||
| -rw-r--r-- | archivers/pax/Makefile.common | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile index f3c502c9e28..7bef5336c51 100644 --- a/archivers/pax/Makefile +++ b/archivers/pax/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.27 2006/07/14 19:45:12 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2006/07/14 20:11:10 jlam Exp $ .include "Makefile.common" CATEGORIES= archivers +.include "../../pkgtools/libnbcompat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/archivers/pax/Makefile.common b/archivers/pax/Makefile.common index 18af5f723b8..3d68ec85c8e 100644 --- a/archivers/pax/Makefile.common +++ b/archivers/pax/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2006/07/14 19:45:12 jlam Exp $ +# $NetBSD: Makefile.common,v 1.3 2006/07/14 20:11:10 jlam Exp $ # # This Makefile fragment is included by: # @@ -24,11 +24,5 @@ PKGDIR= ${.CURDIR}/../../archivers/pax .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} |