diff options
| author | jlam <jlam> | 2002-07-24 20:30:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-07-24 20:30:06 +0000 |
| commit | 0ec5367e84e409b471dffdbee60b243c7dc4d427 (patch) | |
| tree | ff71f6b5d68196ca164244cf16845f9742667b3a /mk/install | |
| parent | dac5e5fbfdc2842e37d61b03905ebe444cdd5f5f (diff) | |
| download | pkgsrc-0ec5367e84e409b471dffdbee60b243c7dc4d427.tar.gz | |
Create a new variable "RCD_SCRIPTS_EXAMPLEDIR" that contains the location
of the example rc.d scripts for a package. This defaults to
${PREFIX}/etc/rc.d, but may be reset for those odd packages, e.g. qmail,
that set LOCALBASE=/.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/deinstall | 4 | ||||
| -rw-r--r-- | mk/install/header | 3 | ||||
| -rw-r--r-- | mk/install/install | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/mk/install/deinstall b/mk/install/deinstall index ffd4e1b82a1..ec5499092e3 100644 --- a/mk/install/deinstall +++ b/mk/install/deinstall @@ -1,6 +1,6 @@ # start of deinstall # -# $NetBSD: deinstall,v 1.10 2002/06/27 20:43:44 jlam Exp $ +# $NetBSD: deinstall,v 1.11 2002/07/24 20:30:06 jlam Exp $ eval set -- ${PKG_USERS} for userset; do @@ -27,7 +27,7 @@ for file; do done eval set -- ${RCD_SCRIPTS} for script; do - samplefile="${PKG_PREFIX}/etc/rc.d/${script}" + samplefile="${RCD_SCRIPTS_EXAMPLEDIR}/${script}" file="${RCD_SCRIPTS_DIR}/${script}" shift ALL_FILES="${ALL_FILES} \"${samplefile}\" \"${file}\"" diff --git a/mk/install/header b/mk/install/header index 599c5270dca..7c6fdb536f7 100644 --- a/mk/install/header +++ b/mk/install/header @@ -2,7 +2,7 @@ # # start of header # -# $NetBSD: header,v 1.11 2002/06/27 20:42:15 jlam Exp $ +# $NetBSD: header,v 1.12 2002/07/24 20:30:06 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -50,6 +50,7 @@ SUPPORT_FILES="@SUPPORT_FILES@" SUPPORT_FILES_PERMS="@SUPPORT_FILES_PERMS@" RCD_SCRIPTS="@RCD_SCRIPTS@" RCD_SCRIPTS_DIR="@RCD_SCRIPTS_DIR@" +RCD_SCRIPTS_EXAMPLEDIR="@RCD_SCRIPTS_EXAMPLEDIR@" MAKE_DIRS="@MAKE_DIRS@" MAKE_DIRS_PERMS="@MAKE_DIRS_PERMS@" diff --git a/mk/install/install b/mk/install/install index 0f65c9491da..7a978bcc23d 100644 --- a/mk/install/install +++ b/mk/install/install @@ -1,6 +1,6 @@ # start of install # -# $NetBSD: install,v 1.10 2002/06/27 20:46:31 jlam Exp $ +# $NetBSD: install,v 1.11 2002/07/24 20:30:07 jlam Exp $ case ${STAGE} in PRE-INSTALL) @@ -296,7 +296,7 @@ EOF done eval set -- ${RCD_SCRIPTS} for script; do - samplefile="${PKG_PREFIX}/etc/rc.d/${script}" + samplefile="${RCD_SCRIPTS_EXAMPLEDIR}/${script}" file="${RCD_SCRIPTS_DIR}/${script}" if [ "${_PKG_CONFIG}" = "NO" ]; then |