diff options
| author | agc <agc@pkgsrc.org> | 2000-07-14 16:04:19 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-14 16:04:19 +0000 |
| commit | 69cbb390716850e6a8c835f7b91ef8d8df65fb92 (patch) | |
| tree | aa658f354e6a972c06b16f22e2cbf7898068e0c8 /mk | |
| parent | 06a57d66d0054c05fe01defeb25c312035a3d99e (diff) | |
| download | pkgsrc-69cbb390716850e6a8c835f7b91ef8d8df65fb92.tar.gz | |
The previous method of using a make target for finding a prerequisite
package's prefix would not work as part of the environment specification
via MAKE_ENV (as it would not be executed in the correct directory).
Fix this by invoking pkg_info(1) directly, not via an intermediate make(1)
step - this is not as clean, but more effective (i.e. it works).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ed9a784b937..d65c1fee1bc 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.503 2000/07/14 06:55:26 rh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.504 2000/07/14 16:04:24 agc Exp $ # # This file is in the public domain. # @@ -1182,16 +1182,8 @@ show-downlevel: .endif .endif -show-gtk+-prefix: _SHOW_PREFIX_USE -show-imlib-prefix: _SHOW_PREFIX_USE -show-kdebase-prefix: _SHOW_PREFIX_USE -show-qt1-prefix: _SHOW_PREFIX_USE -show-qt2-prefix: _SHOW_PREFIX_USE -show-xpm-prefix: _SHOW_PREFIX_USE - -_SHOW_PREFIX_USE: .USE - @${PKG_INFO} -qp ${.TARGET:S/^show-//:S/-prefix//} 2>/dev/null | \ - ${AWK} 'BEGIN { p="${X11PREFIX}" } { p = $$2 } END { printf("%s\n", p) }' +SHOW_PREFIX1= ${PKG_INFO} -qp +SHOW_PREFIX2= 2>/dev/null | ${AWK} 'BEGIN { p="${X11PREFIX}" } { p = $$2 } END { printf("%s\n", p) }' .if !target(show-pkgsrc-dir) show-pkgsrc-dir: |