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 /x11/khostchooser | |
| 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 'x11/khostchooser')
| -rw-r--r-- | x11/khostchooser/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index 8912853fc3d..7ccf865d813 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:47 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:27 agc Exp $ # DISTNAME= khostchooser-0.3 @@ -19,11 +19,11 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${PREFIX}/share/kde \ - --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 + --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ - MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \ + QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ + MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" |