From 8e8319ef6e999c5e3b3466341abeb997d798de63 Mon Sep 17 00:00:00 2001 From: grant Date: Wed, 26 Feb 2003 03:03:47 +0000 Subject: prefer PREFIX/bin/gzip (and friends) and pax, if they exist. --- mk/defs.SunOS.mk | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index b8ac41acf44..87833196efd 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.52 2003/01/15 20:55:39 jlam Exp $ +# $NetBSD: defs.SunOS.mk,v 1.53 2003/02/26 03:03:47 grant Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -28,17 +28,16 @@ GTAR?= ${LOCALBASE}/bin/gtar .else GTAR?= ${ZOULARISBASE}/bin/tar .endif -.if exists(/usr/bin/gzip) -GUNZIP_CMD?= /usr/bin/gunzip -f -GZCAT?= /usr/bin/gzcat -GZIP?= -9 -GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} -.endif .if exists(${LOCALBASE}/bin/gzip) GUNZIP_CMD?= ${LOCALBASE}/bin/gunzip -f GZCAT?= ${LOCALBASE}/bin/zcat GZIP?= -9 GZIP_CMD?= ${LOCALBASE}/bin/gzip -nf ${GZIP} +.elif exists(/usr/bin/gzip) +GUNZIP_CMD?= /usr/bin/gunzip -f +GZCAT?= /usr/bin/gzcat +GZIP?= -9 +GZIP_CMD?= /usr/bin/gzip -nf ${GZIP} .endif HEAD?= /usr/bin/head ID?= /usr/xpg4/bin/id @@ -60,7 +59,11 @@ PATCH?= ${LOCALBASE}/bin/gpatch -b .else PATCH?= ${LOCALBASE}/bin/patch -b .endif +.if exists(${LOCALBASE}/bin/pax) +PAX?= ${LOCALBASE}/bin/pax +.else PAX?= /bin/pax +.endif PERL5?= ${LOCALBASE}/bin/perl PKGLOCALEDIR?= lib PS?= /bin/ps -- cgit v1.2.3