summaryrefslogtreecommitdiff
path: root/mk/pkginstall
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-07-05 06:09:15 +0000
committerjlam <jlam@pkgsrc.org>2006-07-05 06:09:15 +0000
commite31200b87c973f65d2a1f7c8949cc1891040e67e (patch)
tree5cda57cdca85b18146d681fc321900e0b05b7666 /mk/pkginstall
parent00478b39e6c53023f76627af6ffacebafc9db9d6 (diff)
downloadpkgsrc-e31200b87c973f65d2a1f7c8949cc1891040e67e.tar.gz
Refactor configure, build, test and wrapper phases out of bsd.pkg.mk
and into their own directories. Also do some cleanups with build/_build and pkginstall -- we get rid of _build and simply run pkginstall as part of the "build" target. Introduce a new mechanism to handle varying directory depths under ${WRKSRC} in which we find files to override, e.g. configure, config.*, libtool, etc. OVERRIDE_DIRDEPTH is a package-settable variable that specifies how far under ${WRKSRC} the various targets should look, and it defaults to "2". We preserve the meaning of the various *_OVERRIDE variables, so if they are defined, then their values supersede the OVERRIDE_DIRDEPTH mechanism. devel/tla will need to specially set OVERRIDE_DIRDEPTH to 3 (see log for revision 1.1857 for bsd.pkg.mk -- to be done in a separate commit.
Diffstat (limited to 'mk/pkginstall')
-rw-r--r--mk/pkginstall/bsd.pkginstall.mk3
1 files changed, 1 insertions, 2 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index 973a022e570..41aea55a31a 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.11 2006/06/15 22:13:59 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.12 2006/07/05 06:09:15 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and implements the
# common INSTALL/DEINSTALL scripts framework. To use the pkginstall
@@ -966,7 +966,6 @@ install-rcd-${_script_}: ${RCD_SCRIPT_WRK.${_script_}}
_PKGINSTALL_COOKIE= ${WRKDIR}/.pkginstall_done
-_PKGINSTALL_TARGETS+= _build
_PKGINSTALL_TARGETS+= acquire-pkginstall-lock
_PKGINSTALL_TARGETS+= ${_PKGINSTALL_COOKIE}
_PKGINSTALL_TARGETS+= release-pkginstall-lock