diff options
| author | jlam <jlam@pkgsrc.org> | 2008-03-12 15:51:39 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-03-12 15:51:39 +0000 |
| commit | 77ce6ccc01fe24c2403d096f3ccea2557ea2d3bf (patch) | |
| tree | 019a45bd93c6d2a3f8a5ff209a2a2fd3be38caa3 /mk/extract/extract.mk | |
| parent | f08acff9a03d39fc56042f2acaa3fb5e376f560d (diff) | |
| download | pkgsrc-77ce6ccc01fe24c2403d096f3ccea2557ea2d3bf.tar.gz | |
Invent new variable EXTRACTOR that has the environment and path to the
extract script. This can be used in a more natural way by custom
do-extract targets than EXTRACT_CMD.
Diffstat (limited to 'mk/extract/extract.mk')
| -rw-r--r-- | mk/extract/extract.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index f47a12be8f3..175da698b34 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.25 2008/03/12 15:48:21 jlam Exp $ +# $NetBSD: extract.mk,v 1.26 2008/03/12 15:51:39 jlam Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -8,6 +8,9 @@ # # Default value: ${WRKDIR} # +# EXTRACTOR is the the the environment and path used to execute the +# all-purpose extract script. +# # EXTRACT_CMD is a shell command list that extracts the contents of # an archive named by the variable ${DOWNLOADED_DISTFILE} to the # current working directory. The default is ${EXTRACT_CMD_DEFAULT}. @@ -188,11 +191,10 @@ _EXTRACT_TAR= EXTRACT_OPTS+= -t ${_EXTRACT_TAR} .endif -EXTRACT_CMD_DEFAULT= \ - ${SETENV} ${_EXTRACT_ENV} \ - ${SH} ${PKGSRCDIR}/mk/extract/extract \ - ${EXTRACT_OPTS} \ - ${DOWNLOADED_DISTFILE} ${EXTRACT_ELEMENTS} +EXTRACTOR= \ + ${SETENV} ${_EXTRACT_ENV} ${SH} ${PKGSRCDIR}/mk/extract/extract +EXTRACT_CMD_DEFAULT= \ + ${EXTRACTOR} ${EXTRACT_OPTS} ${DOWNLOADED_DISTFILE} ${EXTRACT_ELEMENTS} EXTRACT_CMD?= ${EXTRACT_CMD_DEFAULT} |