diff options
| author | jmmv <jmmv> | 2003-07-31 10:36:03 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2003-07-31 10:36:03 +0000 |
| commit | bb31bf607a0f023d16d9c4b792d1694469673a47 (patch) | |
| tree | a0e0247417ea3b6a69dc07185ebd98d1da256021 /mk | |
| parent | 27839c4901dd478cadf0fc9a335a60c2985e4a39 (diff) | |
| download | pkgsrc-bb31bf607a0f023d16d9c4b792d1694469673a47.tar.gz | |
Let a package override the name of the automatically generated rc.d script
files inside the WRKDIR. This is done by setting RCD_SCRIPT_WRK.<name> to
the requested filename, like:
RCD_SCRIPT_WRK.foobar= ${WRKDIR}/foobar.sh
This fixes a problem (rc.d script not beeing generated) when there is a name
conflict in the WRKDIR (i.e., the file already exists or WRKSRC has the same
basename).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.install.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk index 8d40a609be6..a72babae72c 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/bsd.pkg.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.42 2003/07/30 10:31:20 jlam Exp $ +# $NetBSD: bsd.pkg.install.mk,v 1.43 2003/07/31 10:36:03 jmmv Exp $ # # This Makefile fragment is included by package Makefiles to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -324,26 +324,27 @@ install-rcd-scripts: # do nothing .for _script_ in ${RCD_SCRIPTS} RCD_SCRIPT_SRC.${_script_}?= ${FILESDIR}/${_script_}.sh +RCD_SCRIPT_WRK.${_script_}?= ${WRKDIR}/${_script_} . if !empty(RCD_SCRIPT_SRC.${_script_}) . if exists(${RCD_SCRIPT_SRC.${_script_}}) -generate-rcd-scripts: ${WRKDIR}/${_script_} -${WRKDIR}/${_script_}: ${RCD_SCRIPT_SRC.${_script_}} +generate-rcd-scripts: ${RCD_SCRIPT_WRK.${_script_}} +${RCD_SCRIPT_WRK.${_script_}}: ${RCD_SCRIPT_SRC.${_script_}} ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} | \ ${SED} ${FILES_SUBST_SED} > ${.TARGET} ${_PKG_SILENT}${_PKG_DEBUG}${CHMOD} +x ${.TARGET} install-rcd-scripts: install-rcd-${_script_} -install-rcd-${_script_}: ${WRKDIR}/${_script_} +install-rcd-${_script_}: ${RCD_SCRIPT_WRK.${_script_}} ${_PKG_SILENT}${_PKG_DEBUG} \ if [ ! -d ${RCD_SCRIPTS_EXAMPLEDIR} ]; then \ ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \ -m 0755 ${RCD_SCRIPTS_EXAMPLEDIR}; \ fi ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ -f ${WRKDIR}/${_script_} ]; then \ - ${INSTALL_SCRIPT} ${WRKDIR}/${_script_} \ - ${RCD_SCRIPTS_EXAMPLEDIR}; \ + if [ -f ${RCD_SCRIPT_WRK.${_script_}} ]; then \ + ${INSTALL_SCRIPT} ${RCD_SCRIPT_WRK.${_script_}} \ + ${RCD_SCRIPTS_EXAMPLEDIR}/${_script_}; \ fi . endif . endif |