CVS commit: pkgsrc/mk/pkgformat/pkg

["Johnny C. Lam" <jlam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jlam
Date:           Wed Jun  7 20:24:10 UTC 2017

Modified Files:
        pkgsrc/mk/pkgformat/pkg: scripts.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/mk/pkgformat/pkg/scripts.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/pkgformat/pkg/scripts.mk
diff -u pkgsrc/mk/pkgformat/pkg/scripts.mk:1.3 pkgsrc/mk/pkgformat/pkg/scripts.mk:1.4
--- pkgsrc/mk/pkgformat/pkg/scripts.mk:1.3      Wed Jun  7 20:24:01 2017
+++ pkgsrc/mk/pkgformat/pkg/scripts.mk  Wed Jun  7 20:24:09 2017
@@ -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}