diff options
| author | rillig <rillig> | 2005-08-05 07:06:47 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-08-05 07:06:47 +0000 |
| commit | 7b4c346f94c00290f68cff8d2e55badaddab3638 (patch) | |
| tree | 5465979403e74baefb65b90177f24511f6e616a7 /mk | |
| parent | 98cd203faa4af7fccc3515b34e3c8e44c33d1e0d (diff) | |
| download | pkgsrc-7b4c346f94c00290f68cff8d2e55badaddab3638.tar.gz | |
Fixed evaluation of the PKG_USERS and PKG_GROUPS variables. Noted by
martii on tech-pkg.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/install/bsd.pkginstall.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index 25d851fd75d..87ad1277107 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.8 2005/08/04 21:37:33 rillig Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.9 2005/08/05 07:06:47 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -154,14 +154,20 @@ ${INSTALL_USERGROUP_FILE}: ../../mk/install/usergroup ${ECHO} " \$${CAT} > ./+USERGROUP << 'EOF_USERGROUP'"; \ ${SED} ${FILES_SUBST_SED} ../../mk/install/usergroup; \ ${ECHO} ""; \ - pkg_groups=${PKG_GROUPS:Q}; \ - for i in $$pkg_groups; do \ + if ${TEST} x${PKG_GROUPS:M*:Q} != x; then \ + eval set -- ${PKG_GROUPS} ; \ + while ${TEST} $$# -gt 0; do \ + i=$$1; shift; \ ${ECHO} "# GROUP: $$i"; \ done; \ - pkg_users=${PKG_USERS:Q}; \ - for i in $$pkg_users; do \ + fi; \ + if ${TEST} x${PKG_USERS:M*:Q} != x; then \ + eval set -- ${PKG_USERS} ; \ + while ${TEST} $$# -gt 0; do \ + i=$$1; shift; \ ${ECHO} "# USER: $$i"; \ done; \ + fi; \ ${ECHO} "EOF_USERGROUP"; \ ${ECHO} " \$${CHMOD} +x ./+USERGROUP"; \ ${ECHO} " ;;"; \ |