summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2017-06-07 20:24:09 +0000
committerjlam <jlam@pkgsrc.org>2017-06-07 20:24:09 +0000
commit7c5a1cabaa5b804b00ba16a9a9240a906917f1d9 (patch)
treeddb51012715687078e28aef3ec041b03f96100e3 /mk
parent83329aeef2219217c36be2b78b3e0287e3a92e53 (diff)
downloadpkgsrc-7c5a1cabaa5b804b00ba16a9a9240a906917f1d9.tar.gz
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 (limited to 'mk')
-rw-r--r--mk/pkgformat/pkg/scripts.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/pkgformat/pkg/scripts.mk b/mk/pkgformat/pkg/scripts.mk
index 3ccb6dfbe17..1c53057ab18 100644
--- a/mk/pkgformat/pkg/scripts.mk
+++ b/mk/pkgformat/pkg/scripts.mk
@@ -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+= TRUE=${TRUE:Q}
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}