diff options
author | agc <agc> | 2000-07-14 16:04:19 +0000 |
---|---|---|
committer | agc <agc> | 2000-07-14 16:04:19 +0000 |
commit | 953b30dcb9f29ef6b2426d0faf6c90c45fb947c8 (patch) | |
tree | aa658f354e6a972c06b16f22e2cbf7898068e0c8 /games/kdetoys | |
parent | ffad6cc430cf0a899a5bd3437cd085496d5fa99d (diff) | |
download | pkgsrc-953b30dcb9f29ef6b2426d0faf6c90c45fb947c8.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 'games/kdetoys')
-rw-r--r-- | games/kdetoys/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile index 6bb35579958..994cace7e86 100644 --- a/games/kdetoys/Makefile +++ b/games/kdetoys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:40 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:21 agc Exp $ DISTNAME= kdetoys-1.1.2 CATEGORIES= games kde @@ -17,10 +17,10 @@ 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 \ + QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" |