[pkgsrc/trunk]: pkgsrc/mk/extract Invent new variable EXTRACTOR that has the ...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d66cdd236ec7
branches:  trunk
changeset: 539742:d66cdd236ec7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Mar 12 15:51:39 2008 +0000

description:
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:

 mk/extract/extract.mk |  14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diffs (35 lines):

diff -r d860fb515330 -r d66cdd236ec7 mk/extract/extract.mk
--- a/mk/extract/extract.mk     Wed Mar 12 15:48:21 2008 +0000
+++ b/mk/extract/extract.mk     Wed Mar 12 15:51:39 2008 +0000
@@ -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_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}