summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2003-09-06 11:51:16 +0000
committerjlam <jlam@pkgsrc.org>2003-09-06 11:51:16 +0000
commited5b56072306e41c80380342fd19b2ecda3cc637 (patch)
tree654da13f999fda48276f71209c41d24d065caceb /mk
parent831a403f7f424b110d46db77dacf36dfa1ad1965 (diff)
downloadpkgsrc-ed5b56072306e41c80380342fd19b2ecda3cc637.tar.gz
Move RCD_SCRIPTS_DIR definition to bsd.pkg.defaults.mk. This implies that
RCD_SCRIPTS_DIR is user-settable in /etc/mk.conf.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.defaults.mk8
-rw-r--r--mk/bsd.pkg.install.mk3
2 files changed, 8 insertions, 3 deletions
diff --git a/mk/bsd.pkg.defaults.mk b/mk/bsd.pkg.defaults.mk
index 2bc6ee56174..f71debc7644 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/bsd.pkg.defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.179 2003/09/06 11:39:29 jlam Exp $
+# $NetBSD: bsd.pkg.defaults.mk,v 1.180 2003/09/06 11:51:17 jlam Exp $
#
# A file providing defaults for pkgsrc and the packages collection.
@@ -169,6 +169,12 @@ PKG_SYSCONFBASE?= ${PREFIX}/etc
# Possible: any path you like
# Default: ${PREFIX}/etc
+RCD_SCRIPTS_DIR?= /etc/rc.d
+# This is the system rc.d script directory in which all rc.d scripts
+# expected to be executed at boot-time should be found.
+# Possible: any path you like
+# Default: /etc/rc.d
+
PACKAGES?= ${_PKGSRCDIR}/packages
# Store generated packages on a per-architecture base
# Possible: any path you like
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 8ec7de1fe18..ea8c515b4c0 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.49 2003/09/06 11:43:55 jlam Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.50 2003/09/06 11:51:16 jlam Exp $
#
# This Makefile fragment is included by package Makefiles to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -152,7 +152,6 @@ SUPPORT_FILES_MODE?= 0644
SUPPORT_FILES_PERMS?= # empty
RCD_SCRIPTS?= # empty
RCD_SCRIPTS_MODE?= 0755
-RCD_SCRIPTS_DIR?= /etc/rc.d
RCD_SCRIPTS_EXAMPLEDIR?= ${PREFIX}/etc/rc.d
RCD_SCRIPTS_SHELL?= ${SH}
FILES_SUBST+= CONF_FILES=${CONF_FILES:Q}