diff options
| author | jlam <jlam> | 2003-11-21 10:32:25 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-11-21 10:32:25 +0000 |
| commit | e3d2971d9a86a7e6e855e086148428210a82fbb7 (patch) | |
| tree | 0a85a4e334ce19c8ea09e80a032fa99b461264db /mk | |
| parent | 1ddc358c563173c1d0cbfca554b0b9aa912d977e (diff) | |
| download | pkgsrc-e3d2971d9a86a7e6e855e086148428210a82fbb7.tar.gz | |
Back out part of rev. 1.24: we don't need to add config files to the view
if only rc.d scripts are present. rc.d scripts always live in ${PREFIX}
regardless of the setting for ${PKG_SYSCONFBASE}.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/install/install | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mk/install/install b/mk/install/install index b6658e076c3..9554a456504 100644 --- a/mk/install/install +++ b/mk/install/install @@ -1,6 +1,6 @@ # start of install # -# $NetBSD: install,v 1.26 2003/09/18 23:02:33 grant Exp $ +# $NetBSD: install,v 1.27 2003/11/21 10:32:25 jlam Exp $ if [ -z "${CONF_FILES}" -a -z "${CONF_FILES_PERMS}" -a \ -z "${SUPPORT_FILES}" -a -z "${SUPPORT_FILES_PERMS}" -o \ @@ -400,13 +400,15 @@ VIEW-INSTALL) (${GREP} -v "^${PKG_SHELL}" /etc/shells.pkgsrc."$$" || ${TRUE}; ${ECHO} ${PKG_SHELL}) > /etc/shells ${RM} /etc/shells.pkgsrc."$$" fi + # + # If ${PKG_SYSCONFBASE} points outside of ${PREFIX}, then add the + # package config files to the proper view. + # if [ "${_PKG_CONFIG}" = "YES" -a -n "${PKG_SYSCONFDEPOTBASE}" ]; then if [ -n "${CONF_FILES}" -o \ -n "${CONF_FILES_PERMS}" -o \ -n "${SUPPORT_FILES}" -o \ - -n "${SUPPORT_FILES_PERMS}" ] || \ - [ "${_PKG_RCD_SCRIPTS}" = "YES" -a \ - -n "${RCD_SCRIPTS}" ]; then + -n "${SUPPORT_FILES_PERMS}" ]; then ${SETENV} PLIST_IGNORE_FILES="${CONF_IGNORE_FILES}" \ ${LINKFARM} -t ${PKG_SYSCONFVIEWBASE} -d ${PKG_SYSCONFDEPOTBASE} ${PKGNAME} fi |