summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorhubertf <hubertf@pkgsrc.org>1998-02-02 08:10:41 +0000
committerhubertf <hubertf@pkgsrc.org>1998-02-02 08:10:41 +0000
commit403cfa3d46c5e57f70a52b18a921f538acd81dcd (patch)
tree6e1b9b0a665b1bf62f72ac6acdcc5cdb24156507 /mk
parentba0b20c23aa5a7098956960e08083b669319a77d (diff)
downloadpkgsrc-403cfa3d46c5e57f70a52b18a921f538acd81dcd.tar.gz
Introduce TRUE?=/usr/bin/true, and use it.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk13
-rw-r--r--mk/bsd.port.mk13
2 files changed, 14 insertions, 12 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7e26fea1617..4169bb00adb 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $NetBSD: bsd.pkg.mk,v 1.42 1998/01/30 13:53:53 agc Exp $
+# $NetBSD: bsd.pkg.mk,v 1.43 1998/02/02 08:11:49 hubertf Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -457,10 +457,6 @@ BUILD_COOKIE?= ${WRKDIR}/.build_done
PATCH_COOKIE?= ${WRKDIR}/.patch_done
PACKAGE_COOKIE?= ${WRKDIR}/.package_done
-# How to do nothing. Override if you, for some strange reason, would rather
-# do something.
-DO_NADA?= /usr/bin/true
-
# Miscellaneous overridable commands:
GMAKE?= gmake
XMKMF?= xmkmf -a
@@ -633,10 +629,15 @@ SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
TR?= /usr/bin/tr
+TRUE?= /usr/bin/true
# Used to print all the '===>' style prompts - override this to turn them off.
ECHO_MSG?= ${ECHO}
+# How to do nothing. Override if you, for some strange reason, would rather
+# do something.
+DO_NADA?= ${TRUE}
+
ALL_TARGET?= all
INSTALL_TARGET?= install
@@ -1871,7 +1872,7 @@ fake-pkg: ${PLIST}
if [ -f ${PKGDIR}/MESSAGE ]; then \
${CP} ${PKGDIR}/MESSAGE ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
fi; \
- for dep in `make package-depends ECHO_MSG=/usr/bin/true | sort -u`; do \
+ for dep in `make package-depends ECHO_MSG=${TRUE} | sort -u`; do \
if [ -d ${PKG_DBDIR}/$$dep ]; then \
if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
>/dev/null 2>&1; then \
diff --git a/mk/bsd.port.mk b/mk/bsd.port.mk
index db8856ee97e..006b00ed564 100644
--- a/mk/bsd.port.mk
+++ b/mk/bsd.port.mk
@@ -1,7 +1,7 @@
#-*- mode: Fundamental; tab-width: 4; -*-
# ex:ts=4
#
-# $NetBSD: bsd.port.mk,v 1.42 1998/01/30 13:53:53 agc Exp $
+# $NetBSD: bsd.port.mk,v 1.43 1998/02/02 08:11:49 hubertf Exp $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
@@ -457,10 +457,6 @@ BUILD_COOKIE?= ${WRKDIR}/.build_done
PATCH_COOKIE?= ${WRKDIR}/.patch_done
PACKAGE_COOKIE?= ${WRKDIR}/.package_done
-# How to do nothing. Override if you, for some strange reason, would rather
-# do something.
-DO_NADA?= /usr/bin/true
-
# Miscellaneous overridable commands:
GMAKE?= gmake
XMKMF?= xmkmf -a
@@ -633,10 +629,15 @@ SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
TR?= /usr/bin/tr
+TRUE?= /usr/bin/true
# Used to print all the '===>' style prompts - override this to turn them off.
ECHO_MSG?= ${ECHO}
+# How to do nothing. Override if you, for some strange reason, would rather
+# do something.
+DO_NADA?= ${TRUE}
+
ALL_TARGET?= all
INSTALL_TARGET?= install
@@ -1871,7 +1872,7 @@ fake-pkg: ${PLIST}
if [ -f ${PKGDIR}/MESSAGE ]; then \
${CP} ${PKGDIR}/MESSAGE ${PKG_DBDIR}/${PKGNAME}/+DISPLAY; \
fi; \
- for dep in `make package-depends ECHO_MSG=/usr/bin/true | sort -u`; do \
+ for dep in `make package-depends ECHO_MSG=${TRUE} | sort -u`; do \
if [ -d ${PKG_DBDIR}/$$dep ]; then \
if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
>/dev/null 2>&1; then \