[pkgsrc/trunk]: pkgsrc/mk/install Back out part of rev. 1.24: we don't need t...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9819b82d42b7
branches:  trunk
changeset: 463627:9819b82d42b7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 21 10:32:25 2003 +0000

description:
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:

 mk/install/install |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 63addf4ea9d0 -r 9819b82d42b7 mk/install/install
--- a/mk/install/install        Fri Nov 21 09:31:15 2003 +0000
+++ b/mk/install/install        Fri Nov 21 10:32:25 2003 +0000
@@ -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 @@
                (${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