From 6bab469a2294f580aa6c7a2c3f5bd9608b1ecf55 Mon Sep 17 00:00:00 2001 From: fhajny Date: Fri, 9 Mar 2012 10:20:15 +0000 Subject: Only conflict with gtar-base and gcpio if NBPAX_PROGRAM_PREFIX empty. --- archivers/pax/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/archivers/pax/Makefile b/archivers/pax/Makefile index bec563ecc8e..38b29fc8795 100644 --- a/archivers/pax/Makefile +++ b/archivers/pax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2012/03/04 19:50:21 joerg Exp $ +# $NetBSD: Makefile,v 1.45 2012/03/09 10:20:15 fhajny Exp $ DISTNAME= pax-20080110 CATEGORIES= archivers @@ -26,10 +26,12 @@ CONFIGURE_ARGS+= --program-prefix=${NBPAX_PROGRAM_PREFIX:Q} .else # pax installs "tar" and "cpio" -.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) +.if defined(GNU_PROGRAM_PREFIX) && empty(GNU_PROGRAM_PREFIX) && \ + (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX)) CONFLICTS+= gcpio-[0-9]* .endif -.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) +.if defined(GTAR_PROGRAM_PREFIX) && empty(GTAR_PROGRAM_PREFIX) && \ + (!defined(NBPAX_PROGRAM_PREFIX) || empty(NBPAX_PROGRAM_PREFIX)) CONFLICTS+= gtar-base-[0-9]* .endif -- cgit v1.2.3