diff options
| author | rillig <rillig> | 2008-01-23 14:59:35 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2008-01-23 14:59:35 +0000 |
| commit | 86cf5f60843485941decda1b1456b4b999ae25a2 (patch) | |
| tree | d23f9b02d26a387c25038b15f2bb6890872aea1d | |
| parent | 5b941acd41eaf72b4f33a25bbb154d64bfa7c287 (diff) | |
| download | pkgsrc-86cf5f60843485941decda1b1456b4b999ae25a2.tar.gz | |
Got rid of _PKG_SILENT. Why use __file__ when a simple f does the same?
| -rw-r--r-- | mk/extract/extract.mk | 16 |
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 |