diff options
| author | dholland <dholland> | 2015-08-10 05:41:10 +0000 |
|---|---|---|
| committer | dholland <dholland> | 2015-08-10 05:41:10 +0000 |
| commit | 753aa15c3d5d1758ff26d29e009e877d5e48dc2e (patch) | |
| tree | f2867e3997a376d3324233ac114d315d91677ce8 /mk/pkginstall | |
| parent | d69cc722ff3c8ba859020a02deab42860a3a623c (diff) | |
| download | pkgsrc-753aa15c3d5d1758ff26d29e009e877d5e48dc2e.tar.gz | |
Construct rc.d scripts in a subdirectory of WRKDIR (.rc.d/) instead of
right in it, to avoid name conflicts. PR 39271.
Diffstat (limited to 'mk/pkginstall')
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index cbab45449de..0e65505b4ee 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.62 2015/02/24 09:46:09 wiz Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.63 2015/08/10 05:41:10 dholland Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -1163,12 +1163,13 @@ install-rcd-scripts: # do nothing .for _script_ in ${_INSTALL_RCD_SCRIPTS} RCD_SCRIPT_SRC.${_script_}?= ${FILESDIR}/${_script_}.sh -RCD_SCRIPT_WRK.${_script_}?= ${WRKDIR}/${_script_} +RCD_SCRIPT_WRK.${_script_}?= ${WRKDIR}/.rc.d/${_script_} . if !empty(RCD_SCRIPT_SRC.${_script_}) generate-rcd-scripts: ${RCD_SCRIPT_WRK.${_script_}} ${RCD_SCRIPT_WRK.${_script_}}: ${RCD_SCRIPT_SRC.${_script_}} @${STEP_MSG} "Creating ${.TARGET}" + ${RUN}${MKDIR} ${.TARGET:H} ${RUN}${CAT} ${.ALLSRC} | ${SED} ${FILES_SUBST_SED} > ${.TARGET} ${RUN}${CHMOD} +x ${.TARGET} |