From 416feb0be7700c089f85e540898f56701aa47b84 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Wed, 23 Oct 2002 17:43:16 +0000
Subject: Unless PKG_RCD_SCRIPTS=YES and RCD_SCRIPTS is non-empty, don't create
 ${RCD_SCRIPTS_DIR} as it's not used at all.

---
 mk/install/deinstall | 4 ++--
 mk/install/install   | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'mk/install')

diff --git a/mk/install/deinstall b/mk/install/deinstall
index cb923e9460f..debc3c768ab 100644
--- a/mk/install/deinstall
+++ b/mk/install/deinstall
@@ -1,6 +1,6 @@
 # start of deinstall
 #
-# $NetBSD: deinstall,v 1.13 2002/10/17 16:15:14 heinz Exp $
+# $NetBSD: deinstall,v 1.14 2002/10/23 17:43:17 jlam Exp $
 
 eval set -- ${PKG_USERS}
 for userset; do
@@ -41,7 +41,7 @@ while [ $# -gt 0 ]; do
 	ALL_FILES="${ALL_FILES} \"${samplefile}\" \"${file}\""
 done
 
-eval set -- ${MAKE_DIRS}
+eval set -- ${RCD_SCRIPTS_DIR} ${MAKE_DIRS}
 for dir; do
 	ALL_MAKE_DIRS="${ALL_MAKE_DIRS} \"${dir}\""
 done
diff --git a/mk/install/install b/mk/install/install
index 70db7f40f48..554e6dd0fd8 100644
--- a/mk/install/install
+++ b/mk/install/install
@@ -1,6 +1,6 @@
 # start of install
 #
-# $NetBSD: install,v 1.15 2002/10/04 23:46:27 jlam Exp $
+# $NetBSD: install,v 1.16 2002/10/23 17:43:17 jlam Exp $
 
 case ${STAGE} in
 PRE-INSTALL)
@@ -110,7 +110,12 @@ POST-INSTALL)
 	if [ -n "${MAKE_DIRS}" -o -n "${OWN_DIRS}" -o			\
 	     -n "${MAKE_DIRS_PERMS}" -o -n "${OWN_DIRS_PERMS}" ]; then
 		_print_dir_header=1
-		eval set -- ${MAKE_DIRS} ${OWN_DIRS}
+		if [ -z "${RCD_SCRIPTS}" -o "${_PKG_RCD_SCRIPTS}" = "NO" ]; then
+			_RCD_SCRIPTS_DIR=
+		else
+			_RCD_SCRIPTS_DIR="${RCD_SCRIPTS_DIR}"
+		fi
+		eval set -- ${_RCD_SCRIPTS_DIR} ${MAKE_DIRS} ${OWN_DIRS}
 		for dir; do
 			if [ -d "${dir}" ]; then
 				continue
-- 
cgit v1.2.3