summaryrefslogtreecommitdiff
path: root/x11/qwspritefield
diff options
context:
space:
mode:
authoragc <agc@pkgsrc.org>2000-07-14 16:04:19 +0000
committeragc <agc@pkgsrc.org>2000-07-14 16:04:19 +0000
commit69cbb390716850e6a8c835f7b91ef8d8df65fb92 (patch)
treeaa658f354e6a972c06b16f22e2cbf7898068e0c8 /x11/qwspritefield
parent06a57d66d0054c05fe01defeb25c312035a3d99e (diff)
downloadpkgsrc-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/qwspritefield')
-rw-r--r--x11/qwspritefield/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index c79943c187b..99376efa014 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:48 agc Exp $
+# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:28 agc Exp $
DISTNAME= QwSpriteField1.6
PKGNAME= qwspritefield-1.6
@@ -18,14 +18,14 @@ WRKSRC= ${WRKDIR}/QwSpriteField
QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
-PATH= `${MAKE} show-qt1-prefix`/qt1/bin:$$PATH
+PATH= `${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH
-MAKE_ENV+= "QTDIR=`${MAKE} show-qt1-prefix`/qt1"
+MAKE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
do-install:
@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
${PREFIX}/lib
- @qt1dir=`${MAKE} show-qt1-prefix`; \
+ @qt1dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`; \
for file in ${QW_INCLUDES}; do \
${INSTALL_DATA} ${WRKSRC}/${FILE} $$qt1dir/qt1/include; \
done