diff options
| author | reed <reed@pkgsrc.org> | 2004-10-11 22:04:19 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2004-10-11 22:04:19 +0000 |
| commit | 15fee44a6ca90ee69da62ebfdc56244e4aece5e7 (patch) | |
| tree | 98bcbe4bc8de1c9598b03b359fde8d92a659ce6a /mk/install | |
| parent | 3ad222cc6fa7141ad1081c16fdcdbf58dbed1191 (diff) | |
| download | pkgsrc-15fee44a6ca90ee69da62ebfdc56244e4aece5e7.tar.gz | |
Make it so RCD_SCRIPTS_EXAMPLEDIR is a directory relative to
${PREFIX}. It is not an absolute path because with the automatic
addition of the entry to the PLIST would be bogus if someone
defined it to some RCD_SCRIPTS_EXAMPLEDIR outside of PREFIX.
(This may cause multiple rc.d directories if there are multiple
PREFIXes, but I think that is fine.)
Note that at this time, this doesn't change the RCD_SCRIPTS_EXAMPLEDIR
default directory. This will change soon.
Most of this has been in use for over a year.
Also some of this is from Greg Woods. Thank you Greg.
I will next update a few other references to RCD_SCRIPTS_EXAMPLEDIR.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/deinstall | 4 | ||||
| -rw-r--r-- | mk/install/install | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/install/deinstall b/mk/install/deinstall index 8e30d2674d7..2cb733b8f8a 100644 --- a/mk/install/deinstall +++ b/mk/install/deinstall @@ -1,6 +1,6 @@ # start of deinstall # -# $NetBSD: deinstall,v 1.28 2004/07/10 20:42:37 salo Exp $ +# $NetBSD: deinstall,v 1.29 2004/10/11 22:04:19 reed Exp $ eval set -- ${PKG_USERS} for userset; do @@ -31,7 +31,7 @@ done if [ "${_PKG_RCD_SCRIPTS}" = "YES" ]; then eval set -- ${RCD_SCRIPTS} for script; do - samplefile="${RCD_SCRIPTS_EXAMPLEDIR}/${script}" + samplefile="${PKG_PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/${script}" file="${RCD_SCRIPTS_DIR}/${script}" shift ALL_FILES="${ALL_FILES} \"${samplefile}\" \"${file}\"" diff --git a/mk/install/install b/mk/install/install index df8e063b963..a28fb956c8a 100644 --- a/mk/install/install +++ b/mk/install/install @@ -1,6 +1,6 @@ # start of install # -# $NetBSD: install,v 1.31 2004/07/10 20:42:37 salo Exp $ +# $NetBSD: install,v 1.32 2004/10/11 22:04:19 reed Exp $ if [ -z "${CONF_FILES}" -a -z "${CONF_FILES_PERMS}" -a \ -z "${SUPPORT_FILES}" -a -z "${SUPPORT_FILES_PERMS}" -o \ @@ -311,7 +311,7 @@ EOF done eval set -- ${RCD_SCRIPTS} for script; do - samplefile="${RCD_SCRIPTS_EXAMPLEDIR}/${script}" + samplefile="${PKG_PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR}/${script}" file="${RCD_SCRIPTS_DIR}/${script}" if [ "${_PKG_CONFIG}" = "NO" -o \ |