Skip to content

Commit

Permalink
Merge from 1.274
Browse files Browse the repository at this point in the history
  • Loading branch information
steve authored and steve committed May 4, 1998
1 parent 2ed0ad8 commit 8382b5e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Mk/bsd.port.mk
Expand Up @@ -6,7 +6,7 @@
# bsd.port.mk - 940820 Jordan K. Hubbard.
# This file is in the public domain.
#
# $Id: bsd.port.mk,v 1.165.2.34 1997/11/12 10:43:04 asami Exp $
# $Id: bsd.port.mk,v 1.165.2.35 1997/11/20 05:34:49 asami Exp $
#
# Please view me with 4 column tabs!

Expand Down Expand Up @@ -1626,12 +1626,12 @@ describe:
${ECHO} -n "|${MAINTAINER}|${CATEGORIES}|"; \
case "A${FETCH_DEPENDS}B${BUILD_DEPENDS}C${LIB_DEPENDS}D${DEPENDS}E" in \
ABCDE) ;; \
*) cd ${.CURDIR} && ${ECHO} -n `make depends-list|sort -u`;; \
*) cd ${.CURDIR} && ${ECHO} -n `${MAKE} depends-list|sort -u`;; \
esac; \
${ECHO} -n "|"; \
case "A${RUN_DEPENDS}B${LIB_DEPENDS}C${DEPENDS}D" in \
ABCD) ;; \
*) cd ${.CURDIR} && ${ECHO} -n `make package-depends|sort -u`;; \
*) cd ${.CURDIR} && ${ECHO} -n `${MAKE} package-depends|sort -u`;; \
esac; \
${ECHO} ""
.endif
Expand Down Expand Up @@ -1662,7 +1662,7 @@ print-depends-list:
.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \
defined(LIB_DEPENDS) || defined(DEPENDS)
@${ECHO} -n 'This port requires package(s) "'
@${ECHO} -n `make depends-list | sort -u`
@${ECHO} -n `${MAKE} depends-list | sort -u`
@${ECHO} '" to build.'
.endif
.endif
Expand All @@ -1671,7 +1671,7 @@ print-depends-list:
print-package-depends:
.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS)
@${ECHO} -n 'This port requires package(s) "'
@${ECHO} -n `make package-depends | sort -u`
@${ECHO} -n `${MAKE} package-depends | sort -u`
@${ECHO} '" to run.'
.endif
.endif
Expand Down Expand Up @@ -1705,7 +1705,7 @@ fake-pkg:
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=/usr/bin/true | sort -u`; do \
if [ -d ${PKG_DBDIR}/$$dep ]; then \
if ! ${GREP} ^${PKGNAME}$$ ${PKG_DBDIR}/$$dep/+REQUIRED_BY \
>/dev/null 2>&1; then \
Expand Down

0 comments on commit 8382b5e

Please sign in to comment.