diff options
| author | jlam <jlam> | 2006-04-29 04:36:13 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-04-29 04:36:13 +0000 |
| commit | 5299ca9bfe1dabf0572e13112c29c2c0d1e41ea3 (patch) | |
| tree | ad1acbc95b446dc77725be63a777bbbeefa2a610 | |
| parent | 28287aebae107e5632fba06d52b7a74fe5ca2193 (diff) | |
| download | pkgsrc-5299ca9bfe1dabf0572e13112c29c2c0d1e41ea3.tar.gz | |
Ensure that @VAR@ placeholders in usergroupfuncs are properly substituted
for by running it through a separate FILES_SUBST_SED filter. This fixes
the case where the user wasn't being created if USERGROUP_PHASE was
defined.
| -rw-r--r-- | mk/install/bsd.pkginstall.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index 279d2d811c6..0a8340d4872 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.52 2006/04/29 03:54:10 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.53 2006/04/29 04:36:13 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -232,8 +232,8 @@ ${_INSTALL_USERGROUP_FILE}: \ ${INSTALL_USERGROUPFUNCS_FILE} ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H} ${_PKG_SILENT}${_PKG_DEBUG} \ - ${SED} -e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ${FILES_SUBST_SED} \ - ../../mk/install/usergroup > ${.TARGET} + ${SED} -e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ../../mk/install/usergroup | \ + ${SED} ${FILES_SUBST_SED} > ${.TARGET} ${_PKG_SILENT}${_PKG_DEBUG} \ if ${_ZERO_FILESIZE_P} ${_INSTALL_USERGROUP_DATAFILE}; then \ ${RM} -f ${.TARGET}; \ |