summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-03-18 15:17:55 +0000
committerjlam <jlam@pkgsrc.org>2002-03-18 15:17:55 +0000
commit387f4cee22559170de034152b25a43d6d4847cd9 (patch)
tree2f5fcabc0874dc00fe9aa14f2bd98184512e3b2c
parent17885721f4eefffb3e04e7cbce1cbb57bfa72d3a (diff)
downloadpkgsrc-387f4cee22559170de034152b25a43d6d4847cd9.tar.gz
Back out some changes that I didn't intend to commit.
-rw-r--r--mk/bsd.pkg.install.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 3018215cebf..01a3f31d079 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.17 2002/03/15 20:08:17 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.18 2002/03/18 15:17:55 jlam Exp $
#
# This Makefile fragment is included by package Makefiles to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -129,14 +129,10 @@ FILES_SUBST+= SUPPORT_FILES_PERMS=${SUPPORT_FILES_PERMS:Q}
# Default to not installing the rc.d scripts automatically.
INSTALL_RCD_SCRIPTS?= NO
-RC_PKG_CONF?= /etc/defaults/rc.pkg.conf
-
.if defined(INSTALL_RCD_SCRIPTS) && (${INSTALL_RCD_SCRIPTS} == NO)
FILES_SUBST+= RCD_SCRIPTS=
-FILES_SUBST+= RC_PKG_CONF=/dev/null
.else
FILES_SUBST+= RCD_SCRIPTS=${RCD_SCRIPTS:Q}
-FILES_SUBST+= RC_PKG_CONF=${RC_PKG_CONF:Q}
.endif
FILES_SUBST+= RCD_SCRIPTS_MODE=${RCD_SCRIPTS_MODE}
FILES_SUBST+= RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}