From e3d2971d9a86a7e6e855e086148428210a82fbb7 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 21 Nov 2003 10:32:25 +0000
Subject: 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}.

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

(limited to 'mk/install')

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
-- 
cgit v1.2.3