summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>1999-05-17 22:24:15 +0000
committertron <tron@pkgsrc.org>1999-05-17 22:24:15 +0000
commitedc762690cfe91bcb4d107d0fef2890b0f45a3dc (patch)
tree31cc87ae8d7582cc556fd1a876cb7da6f4ee2429 /mk
parentbb4d12896ba26f3a8b90854c2d8cb035461e9a78 (diff)
downloadpkgsrc-edc762690cfe91bcb4d107d0fef2890b0f45a3dc.tar.gz
Fix broken index file creation. Patch suppled by NAKAJIMA Yoshihiro
in PR pkg/7545.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk4
-rw-r--r--mk/bsd.pkg.subdir.mk12
2 files changed, 8 insertions, 8 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 51c3da18383..a430d8ba2a0 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.265 1999/05/12 05:35:55 abs Exp $
+# $NetBSD: bsd.pkg.mk,v 1.266 1999/05/17 22:24:15 tron Exp $
#
# This file is in the public domain.
#
@@ -2062,7 +2062,7 @@ describe:
${ECHO} -n "|"; \
case "A${RUN_DEPENDS}B${DEPENDS}C" in \
ABC) ;; \
- *) cd ${.CURDIR} && ${ECHO} -n "`${MAKE} package-depends PACKAGE_DEPENDS_WITH_PATTERNS=true|sort -u`";; \
+ *) cd ${.CURDIR} && ${ECHO} -n `${MAKE} package-depends PACKAGE_DEPENDS_WITH_PATTERNS=true|sort -u`;; \
esac; \
${ECHO} -n "|"; \
if [ "${ONLY_FOR_ARCHS}" = "" ]; then \
diff --git a/mk/bsd.pkg.subdir.mk b/mk/bsd.pkg.subdir.mk
index 3507a732ad6..2f54915616b 100644
--- a/mk/bsd.pkg.subdir.mk
+++ b/mk/bsd.pkg.subdir.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.subdir.mk,v 1.26 1999/03/28 03:56:32 hubertf Exp $
+# $NetBSD: bsd.pkg.subdir.mk,v 1.27 1999/05/17 22:24:15 tron Exp $
# Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
#
@@ -65,7 +65,7 @@ _SUBDIRUSE: .USE
for dud in ${DUDS}; do \
if [ $${dud} = $${entry} ]; then \
OK="false"; \
- ${ECHO} "===> ${_THISDIR_}$${entry} skipped"; \
+ ${ECHO_MSG} "===> ${_THISDIR_}$${entry} skipped"; \
fi; \
done; \
if [ -d ${.CURDIR}/$${entry}.${MACHINE} ]; then \
@@ -74,16 +74,16 @@ _SUBDIRUSE: .USE
edir=$${entry}; \
else \
OK="false"; \
- ${ECHO} "===> ${_THISDIR_}$${entry} non-existent"; \
+ ${ECHO_MSG} "===> ${_THISDIR_}$${entry} non-existent"; \
fi; \
if [ "$$OK" = "" ]; then \
cd ${.CURDIR}/$${edir}; \
if [ -z "${_THISDIR_}" -a ! -d "files" ]; then \
- ${ECHO} "===> category ${_THISDIR_}$${edir}"; \
+ ${ECHO_MSG} "===> category ${_THISDIR_}$${edir}"; \
${MAKE} ${.TARGET:realinstall=install} \
"_THISDIR_=${_THISDIR_}$${edir}/"; \
else \
- ${ECHO} "===> package ${_THISDIR_}$${edir}"; \
+ ${ECHO_MSG} "===> package ${_THISDIR_}$${edir}"; \
${MAKE} ${.TARGET:realinstall=install} \
"_THISDIR_=${_THISDIR_}$${edir}/" || /usr/bin/true ; \
fi ; \
@@ -173,7 +173,7 @@ README.html: .PRECIOUS
${MV} $@.BAK $@ ; \
${RM} $@.tmp4 ; \
else \
- ${ECHO} "===> Creating README.html for ${_THISDIR_}${.CURDIR:T}" ; \
+ ${ECHO_MSG} "===> Creating README.html for ${_THISDIR_}${.CURDIR:T}" ; \
${MV} $@.tmp4 $@ ; \
${RM} -f $@.BAK ; \
fi