summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authortez <tez@pkgsrc.org>2011-04-08 23:06:51 +0000
committertez <tez@pkgsrc.org>2011-04-08 23:06:51 +0000
commit0b39e12a11f7448c229b572548efdf3098d60426 (patch)
treef63dffbb5006b47e6040a2306c83832fa6afb0e3 /mk
parentc20196d50ab1b1e2f6175939d857abd8b8788744 (diff)
downloadpkgsrc-0b39e12a11f7448c229b572548efdf3098d60426.tar.gz
make the name logic for TOOLS_PATH.gtar match the logic in
archivers/gtar-base/Makefile
Diffstat (limited to 'mk')
-rw-r--r--mk/tools/replace.mk8
1 files changed, 7 insertions, 1 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 8097112ba04..167796d47a7 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.230 2011/01/19 13:05:39 jym Exp $
+# $NetBSD: replace.mk,v 1.231 2011/04/08 23:06:51 tez Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -453,7 +453,13 @@ MAKEFLAGS+= TOOLS_IGNORE.gtar=
TOOLS_DEPENDS.gtar?= gtar-base>=1.13.25:../../archivers/gtar-base
TOOLS_CREATE+= gtar
TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gtar=gtar-base
+. if defined(GTAR_PROGRAM_PREFIX)
+TOOLS_PATH.gtar= ${TOOLS_PREFIX.gtar}/bin/${GTAR_PROGRAM_PREFIX}tar
+. elif defined(GNU_PROGRAM_PREFIX) && ${GNU_PROGRAM_PREFIX} != ""
TOOLS_PATH.gtar= ${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar
+. else
+TOOLS_PATH.gtar= ${TOOLS_PREFIX.gtar}/bin/gtar
+. endif
. endif
.endif