diff options
| author | jlam <jlam> | 2004-08-04 23:22:38 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-04 23:22:38 +0000 |
| commit | 6f030450dd52af16523ca3e1d60af13159816933 (patch) | |
| tree | 03a682d3be266ef5866ca8c8838120d37b7e6551 /mk | |
| parent | ebd2c4bdfff9311400abe7a6f0021c3d01c689e3 (diff) | |
| download | pkgsrc-6f030450dd52af16523ca3e1d60af13159816933.tar.gz | |
Sometimes, the dependencies installed are a function of which variables
are set, and it'd be nice to know which ones before the default
dependencies are installed.
Create a new target "pre-install-depends" that is executed before
dependencies are installed. Move the display of BUILD_DEFS
(build-defs-message) into pre-install-depends so that they are displayed
before dependencies are installed.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 11f0c1f5756..08e6de79262 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1484 2004/08/04 15:29:13 jschauma Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1485 2004/08/04 23:22:38 jlam Exp $ # # This file is in the public domain. # @@ -36,9 +36,9 @@ MAKE_ENV+= USETOOLS="${USETOOLS}" # This has to come first to avoid showing all BUILD_DEFS added by this # Makefile, which are usually not customizable. -.PHONY: pre-extract build-defs-message -pre-extract: build-defs-message -.if ${PKGSRC_SHOW_BUILD_DEFS} != "YES" && ${PKGSRC_SHOW_BUILD_DEFS} != "yes" +.PHONY: pre-install-depends build-defs-message +pre-install-depends: build-defs-message +.if !empty(PKGSRC_SHOW_BUILD_DEFS:M[yY][eE][sS]) build-defs-message: .elif !target(build-defs-message) build-defs-message: ${WRKDIR} @@ -3966,13 +3966,14 @@ package-noinstall: # Dependency checking ################################################################ -.PHONY: install-depends +.PHONY: install-depends pre-install-depends +pre-install-depends: .if !target(install-depends) # Tells whether to halt execution if the object formats differ FATAL_OBJECT_FMT_SKEW?= yes WARN_NO_OBJECT_FMT?= yes -install-depends: uptodate-pkgtools +install-depends: uptodate-pkgtools pre-install-depends . if defined(DEPENDS) || defined(BUILD_DEPENDS) . if defined(NO_DEPENDS) @${DO_NADA} |