diff options
| author | jlam <jlam> | 2001-11-21 15:43:01 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-11-21 15:43:01 +0000 |
| commit | 7f0c876b6b42cc2b0ae185611b9b4df6f96f4a64 (patch) | |
| tree | 692b14af18c1bd306ea0193fdd720c5d3c41ecb1 /mk/install | |
| parent | c902b79868a3b1ab4b8157581bcb4d6e8351d7fa (diff) | |
| download | pkgsrc-7f0c876b6b42cc2b0ae185611b9b4df6f96f4a64.tar.gz | |
Change the way the RCD_SCRIPTS variable is used. It now just lists the
names of the scripts and is no longer a MLINKS-type variable. The scripts
are copied into ${RCD_SCRIPTS_DIR} which defaults to /etc/rc.d for now.
It's unclear if Linux/Solaris would set RCD_SCRIPTS_DIR to something else.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/deinstall | 12 | ||||
| -rw-r--r-- | mk/install/header | 3 | ||||
| -rw-r--r-- | mk/install/install | 7 |
3 files changed, 16 insertions, 6 deletions
diff --git a/mk/install/deinstall b/mk/install/deinstall index 81444ffa5ef..b67a9f09ea8 100644 --- a/mk/install/deinstall +++ b/mk/install/deinstall @@ -1,8 +1,16 @@ # start of deinstall # -# $NetBSD: deinstall,v 1.4 2001/11/21 05:38:03 jlam Exp $ +# $NetBSD: deinstall,v 1.5 2001/11/21 15:43:01 jlam Exp $ -ALL_FILES="${CONF_FILES} ${SUPPORT_FILES} ${RCD_SCRIPTS}" +ALL_FILES="${CONF_FILES} ${SUPPORT_FILES}" +set -- ${RCD_SCRIPTS} +while [ $# -gt 0 ] +do + samplefile="${PKG_PREFIX}/etc/rc.d/$1" + file="${RCD_SCRIPTS_DIR}/$1" + shift + ALL_FILES="${ALL_FILES} ${samplefile} ${file}" +done set -- ${CONF_FILES_PERMS} ${SUPPORT_FILES_PERMS} while [ $# -gt 0 ] do diff --git a/mk/install/header b/mk/install/header index ac2275f6a83..2f9a2fa08ba 100644 --- a/mk/install/header +++ b/mk/install/header @@ -2,7 +2,7 @@ # # start of header # -# $NetBSD: header,v 1.2 2001/11/19 23:33:53 jlam Exp $ +# $NetBSD: header,v 1.3 2001/11/21 15:43:01 jlam Exp $ PKGNAME=$1 STAGE=$2 @@ -43,6 +43,7 @@ CONF_FILES_PERMS="@CONF_FILES_PERMS@" SUPPORT_FILES="@SUPPORT_FILES@" SUPPORT_FILES_PERMS="@SUPPORT_FILES_PERMS@" RCD_SCRIPTS="@RCD_SCRIPTS@" +RCD_SCRIPTS_DIR="@RCD_SCRIPTS_DIR@" MAKE_DIRS="@MAKE_DIRS@" MAKE_DIRS_PERMS="@MAKE_DIRS_PERMS@" diff --git a/mk/install/install b/mk/install/install index cac9be212b2..99268bfa51f 100644 --- a/mk/install/install +++ b/mk/install/install @@ -1,6 +1,6 @@ # start of install # -# $NetBSD: install,v 1.2 2001/11/19 23:33:53 jlam Exp $ +# $NetBSD: install,v 1.3 2001/11/21 15:43:01 jlam Exp $ case ${STAGE} in PRE-INSTALL) @@ -125,8 +125,9 @@ POST-INSTALL) set -- ${RCD_SCRIPTS} while [ $# -gt 0 ] do - samplefile="$1"; file="$2" - shift; shift + samplefile="${PKG_PREFIX}/etc/rc.d/$1" + file="${RCD_SCRIPTS_DIR}/$1" + shift if [ -e ${file} ] then |