From eb7400da93b166ab7b2ca3f3ae5dd3cdce72605f Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 6 Sep 2003 11:43:55 +0000
Subject: Install the rcd scripts at post-install time, not at
 post-install-script time.  The rc.d script needs to be recorded in the PLIST,
 and post-install-script time is too late if we use dynamic PLISTs.

---
 mk/bsd.pkg.install.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mk')

diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index eac8fdadf33..8ec7de1fe18 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.48 2003/09/06 11:41:31 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.49 2003/09/06 11:43:55 jlam Exp $
 #
 # This Makefile fragment is included by package Makefiles to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -276,7 +276,7 @@ pre-install-script: generate-install-scripts
 	${_PKG_SILENT}${_PKG_DEBUG}${SETENV} ${INSTALL_SCRIPTS_ENV}	\
 		${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
 
-post-install-script: install-rcd-scripts
+post-install-script:
 	${_PKG_SILENT}${_PKG_DEBUG}${SETENV} ${INSTALL_SCRIPTS_ENV}	\
 		${_PKG_DEBUG_SCRIPT} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
@@ -321,6 +321,7 @@ post-build: generate-rcd-scripts
 generate-rcd-scripts:	# do nothing
 
 .PHONY: install-rcd-scripts
+post-install: install-rcd-scripts
 install-rcd-scripts:	# do nothing
 
 .for _script_ in ${RCD_SCRIPTS}
-- 
cgit v1.2.3