diff options
| author | jlam <jlam@pkgsrc.org> | 2002-06-22 02:48:35 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-06-22 02:48:35 +0000 |
| commit | 063b3c32e8adcd017a383a78ee17c4584f92d3ae (patch) | |
| tree | 1f43bde483824893a84970061dbb80c33ea28c4f /mk/bsd.pkg.mk | |
| parent | 6fcfc63b9168f7009e589aca2a3226cae0eaf193 (diff) | |
| download | pkgsrc-063b3c32e8adcd017a383a78ee17c4584f92d3ae.tar.gz | |
Change PKG_CREATE_USERGROUP and PKG_CONFIG so that their values are merely
defaults for the INSTALL/DEINSTALL scripts. The environment variables of
the same name take precedence during installation of a binary package.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index c982ad6df23..add136aa35e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.993 2002/06/20 20:15:48 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.994 2002/06/22 02:48:35 jlam Exp $ # # This file is in the public domain. # @@ -1921,13 +1921,6 @@ do-build: # Install -.if defined(PKG_CREATE_USERGROUP) -INSTALL_SCRIPT_ENV+= PKG_CREATE_USERGROUP=${PKG_CREATE_USERGROUP} -.endif -.if defined(PKG_CONFIG) -INSTALL_SCRIPT_ENV+= PKG_CONFIG=${PKG_CONFIG} -.endif - .if !target(do-install) do-install: ${_PKG_SILENT}${_PKG_DEBUG}cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} -f ${MAKEFILE} ${INSTALL_TARGET} @@ -2049,11 +2042,11 @@ real-su-install: ${MESSAGE} ${ECHO_MSG} "Become root and try again to ensure correct permissions."; \ fi .endif # !NO_MTREE - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${INSTALL_SCRIPT_ENV} ${MAKE} ${MAKEFLAGS} pre-install-script + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install-script ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} pre-install ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} do-install ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${SETENV} ${INSTALL_SCRIPT_ENV} ${MAKE} ${MAKEFLAGS} post-install-script + ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script .for f in ${INFO_FILES} ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "${INSTALL_INFO} --info-dir=${PREFIX}/info ${PREFIX}/info/${f}"; \ ${INSTALL_INFO} --remove --info-dir=${PREFIX}/info ${PREFIX}/info/${f}; \ |