[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg Fix subsitutions for @PKG_ADMIN@ and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7fcd47578af
branches:  trunk
changeset: 363390:c7fcd47578af
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 07 20:24:09 2017 +0000

description:
Fix subsitutions for @PKG_ADMIN@ and @PKG_INFO@.

The substituted values need to refer to the _CMD variables that
hold the path to the actual commands.

diffstat:

 mk/pkgformat/pkg/scripts.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (20 lines):

diff -r 4482ab0bea73 -r c7fcd47578af mk/pkgformat/pkg/scripts.mk
--- a/mk/pkgformat/pkg/scripts.mk       Wed Jun 07 20:24:01 2017 +0000
+++ b/mk/pkgformat/pkg/scripts.mk       Wed Jun 07 20:24:09 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: scripts.mk,v 1.3 2017/06/07 20:24:01 jlam Exp $
+# $NetBSD: scripts.mk,v 1.4 2017/06/07 20:24:09 jlam Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -169,8 +169,8 @@
 FILES_SUBST+=  XARGS=${XARGS:Q}
 
 # Variables for the pkg_install package tools.
-FILES_SUBST+=  PKG_ADMIN=${PKG_ADMIN:Q}
-FILES_SUBST+=  PKG_INFO=${PKG_INFO:Q}
+FILES_SUBST+=  PKG_ADMIN=${PKG_ADMIN_CMD:Q}
+FILES_SUBST+=  PKG_INFO=${PKG_INFO_CMD:Q}
 
 # Variables for installation prefix references.
 FILES_SUBST+=  CROSSBASE=${CROSSBASE:Q}