summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjoerg <joerg>2007-12-29 20:08:16 +0000
committerjoerg <joerg>2007-12-29 20:08:16 +0000
commit1166c56997ed9fd28922da3fb984aea6096efb27 (patch)
tree038370c37f58283a2cbcef62fa87892060c2f4bf /mk
parentc671e09c7cccf7e551081adc56c60a5e594bcb73 (diff)
downloadpkgsrc-1166c56997ed9fd28922da3fb984aea6096efb27.tar.gz
Fix EXTRACT_USING=gtar and simplify the other cases. TOOLS_GTAR was never
defined and therefore no argument was passed to the extract script. This broke at least scmgit-docs on DragonFly.
Diffstat (limited to 'mk')
-rw-r--r--mk/extract/extract.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk
index a836a2dba56..61285aebe30 100644
--- a/mk/extract/extract.mk
+++ b/mk/extract/extract.mk
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.21 2007/12/01 11:11:55 rillig Exp $
+# $NetBSD: extract.mk,v 1.22 2007/12/29 20:08:16 joerg Exp $
#
# The following variables may be set by the package Makefile and
# specify how extraction happens:
@@ -176,11 +176,11 @@ _EXTRACT_ENV+= ${TOOLS_UNZOO:D UNZOO=${TOOLS_UNZOO:Q}}
_EXTRACT_ENV+= ${EXTRACT_ENV}
.if !empty(EXTRACT_USING:Mgtar)
-EXTRACT_OPTS+= ${TOOLS_GTAR:D -t ${TOOLS_GTAR}}
+EXTRACT_OPTS+= -t ${TOOLS_PATH.gtar}
.elif !empty(EXTRACT_USING:Mnbtar)
-EXTRACT_OPTS+= ${TOOLS_TAR:D -t ${TOOLS_TAR}}
+EXTRACT_OPTS+= -t ${TOOLS_TAR}
.else
-EXTRACT_OPTS+= ${TOOLS_PAX:D -t ${TOOLS_PAX}}
+EXTRACT_OPTS+= -t ${TOOLS_PAX}
.endif
EXTRACT_CMD_DEFAULT= \