summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2002-06-27 20:41:44 +0000
committerjlam <jlam@pkgsrc.org>2002-06-27 20:41:44 +0000
commit87ea621afe8e6b80e18ea24ccd0bfb116c88852e (patch)
treed410430b9aaa60a6014b207fb99e176c7ade685c /mk
parentcaff418d39f16699e26f87d905473733afcb414f (diff)
downloadpkgsrc-87ea621afe8e6b80e18ea24ccd0bfb116c88852e.tar.gz
Back out revisions 1.21 and 1.22 and
(1) do the work of not being so noisy for /etc and /etc/rc.d in the scripts themselves, and (2) make PKG_SYSCONFBASE and PKG_SYSCONFDIR usable from within the INSTALL/DEINSTALL scripts by putting them in the header. This preserves the ability for a single binary package to be used for both PKG_CONFIG=yes or PKG_CONFIG=no.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.install.mk9
1 files changed, 4 insertions, 5 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index b2a45ba038e..a1df486aa80 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.22 2002/06/27 01:55:21 grant Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.23 2002/06/27 20:41:44 jlam Exp $
#
# This Makefile fragment is included by package Makefiles to use the common
# INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply:
@@ -52,6 +52,7 @@ INSTALL_SRC?= ${INSTALL_TEMPLATES}
FILES_SUBST+= PREFIX=${PREFIX}
FILES_SUBST+= LOCALBASE=${LOCALBASE}
FILES_SUBST+= X11BASE=${X11BASE}
+FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE}
FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
FILES_SUBST+= PKGBASE=${PKGBASE}
@@ -146,9 +147,7 @@ FILES_SUBST+= RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
MAKE_DIRS?= # empty
MAKE_DIRS_PERMS?= # empty
_MAKE_DIRS= ${PKG_SYSCONFDIR} ${MAKE_DIRS}
-.if !empty(RCD_SCRIPTS)
_MAKE_DIRS+= ${RCD_SCRIPTS_DIR}
-.endif
OWN_DIRS?= # empty
OWN_DIRS_PERMS?= # empty
FILES_SUBST+= MAKE_DIRS=${_MAKE_DIRS:Q}
@@ -212,10 +211,10 @@ FILES_SUBST+= USERADD=${USERADD:Q}
FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
pre-install-script: generate-install-scripts
- PKG_PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
+ PKG_PREFIX=${PREFIX} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
post-install-script:
- PKG_PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
+ PKG_PREFIX=${PREFIX} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
generate-install-scripts:
${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${DEINSTALL_SRC} | \