From 741e17c0cd4d64dd6c7ea2956910f9a69e96123b Mon Sep 17 00:00:00 2001 From: hubertf Date: Sun, 8 Apr 2001 14:11:48 +0000 Subject: [PATCH] * Invent ZOULARISBASE, defaulting to $LOCALBASE/bsd * allow overriding CHOWN/CHGRP/CHMOD (= -> ?+) --- usr.sbin/pkg_install/Makefile.inc | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/usr.sbin/pkg_install/Makefile.inc b/usr.sbin/pkg_install/Makefile.inc index 98d37b1bc554..97185a76b89a 100644 --- a/usr.sbin/pkg_install/Makefile.inc +++ b/usr.sbin/pkg_install/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.15 2001/03/23 14:06:16 tron Exp $ +# $NetBSD: Makefile.inc,v 1.16 2001/04/08 14:11:48 hubertf Exp $ # Original from FreeBSD, no rcs id. .include @@ -17,23 +17,24 @@ OPSYS="unknown" .endif .if ${OPSYS} == "NetBSD" -CHMOD= /bin/chmod -CHOWN= /usr/sbin/chown -CHGRP= /usr/bin/chgrp +CHMOD?= /bin/chmod +CHOWN?= /usr/sbin/chown +CHGRP?= /usr/bin/chgrp .elif ${OPSYS} == "SunOS" LOCALBASE?= /usr/local TAR_CMD?= tar -TAR_FULLPATHNAME?= ${LOCALBASE}/bsd/bin/${TAR_CMD} +ZOULARISBASE?= ${LOCALBASE}/bsd +TAR_FULLPATHNAME?= ${ZOULARISBASE}/bin/${TAR_CMD} CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"' -BINDIR=${LOCALBASE}/bsd/bin -CHMOD= /usr/bin/chmod -CHOWN= /usr/bin/chown -CHGRP= /usr/bin/chgrp +BINDIR=${ZOULARISBASE}/bin +CHMOD?= /usr/bin/chmod +CHOWN?= /usr/bin/chown +CHGRP?= /usr/bin/chgrp WARNS=0 .elif ${OPSYS} == "Linux" -CHMOD= /bin/chmod -CHOWN= /bin/chown -CHGRP= /bin/chgrp +CHMOD?= /bin/chmod +CHOWN?= /bin/chown +CHGRP?= /bin/chgrp .endif CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"'