summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2008-01-23 14:59:35 +0000
committerrillig <rillig@pkgsrc.org>2008-01-23 14:59:35 +0000
commit800789264a8d67c2cc6384d14dd90e74bf5f3a9d (patch)
treed23f9b02d26a387c25038b15f2bb6890872aea1d /mk
parent8c1132d30925997fdea4b1ca84a7fab305e0544e (diff)
downloadpkgsrc-800789264a8d67c2cc6384d14dd90e74bf5f3a9d.tar.gz
Got rid of _PKG_SILENT. Why use __file__ when a simple f does the same?
Diffstat (limited to 'mk')
-rw-r--r--mk/extract/extract.mk16
1 files changed, 7 insertions, 9 deletions
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk
index c34cdc5a7b4..a9a13a7e056 100644
--- a/mk/extract/extract.mk
+++ b/mk/extract/extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.23 2007/12/30 13:37:18 joerg Exp $
+# $NetBSD: extract.mk,v 1.24 2008/01/23 14:59:35 rillig Exp $
#
# The following variables may be set by the package Makefile and
# specify how extraction happens:
@@ -103,8 +103,7 @@ extract-message:
.PHONY: extract-dir
extract-dir:
- ${_PKG_SILENT}${_PKG_DEBUG} \
- mkdir -p ${EXTRACT_DIR}
+ ${RUN}${MKDIR} ${EXTRACT_DIR}
######################################################################
### extract-check-interactive (PRIVATE)
@@ -131,9 +130,9 @@ extract-check-interactive:
###
.PHONY: extract-cookie
extract-cookie:
- ${_PKG_SILENT}${_PKG_DEBUG}${TEST} ! -f ${_COOKIE.extract} || ${FALSE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${_COOKIE.extract:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${PKGNAME} > ${_COOKIE.extract}
+ ${RUN}${TEST} ! -f ${_COOKIE.extract} || ${FALSE}
+ ${RUN}${MKDIR} ${_COOKIE.extract:H}
+ ${RUN}${ECHO} ${PKGNAME} > ${_COOKIE.extract}
######################################################################
### pre-extract, do-extract, post-extract (PUBLIC, override)
@@ -201,9 +200,8 @@ DOWNLOADED_DISTFILE= $${extract_file}
.if !target(do-extract)
do-extract: ${WRKDIR}
-. for __file__ in ${EXTRACT_ONLY}
- ${_PKG_SILENT}${_PKG_DEBUG} \
- extract_file=${_DISTDIR:Q}/${__file__:Q}; export extract_file; \
+. for f in ${EXTRACT_ONLY}
+ ${RUN} extract_file=${_DISTDIR:Q}/${f:Q}; export extract_file; \
cd ${WRKDIR} && cd ${EXTRACT_DIR} && ${EXTRACT_CMD}
. endfor
.endif