summaryrefslogtreecommitdiff
path: root/x11/qwspritefield
diff options
context:
space:
mode:
authoragc <agc>2000-07-15 20:39:13 +0000
committeragc <agc>2000-07-15 20:39:13 +0000
commit99e9734c1322552385b4029f09f3dc349f4a2510 (patch)
tree16d493248b3dac046feba96b3b2a8fb8abcc8be3 /x11/qwspritefield
parent52fb06f2eeb47f6a33f713dd9a58a5743c6b314f (diff)
downloadpkgsrc-99e9734c1322552385b4029f09f3dc349f4a2510.tar.gz
Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition,
which takes entries of the format <make-definition-name>=<pkgname>. This has not been added to MAKEFLAGS because (a) premature optimisation is the root of all evil, and (b) because the .for loop used to implement this shows the wrong results when multiple prefices are evaluated. Modify all the package Makefiles to use EVAL_PREFIX, thereby simplifying them considerably. ALso simplify the logic to calculate the prefix as well.
Diffstat (limited to 'x11/qwspritefield')
-rw-r--r--x11/qwspritefield/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 99376efa014..0f8d030899f 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:28 agc Exp $
+# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:27 agc Exp $
DISTNAME= QwSpriteField1.6
PKGNAME= qwspritefield-1.6
@@ -18,14 +18,15 @@ WRKSRC= ${WRKDIR}/QwSpriteField
QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
-PATH= `${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH
+EVAL_PREFIX+= QT1DIR=qt1
+PATH= ${QT1DIR}/qt1/bin:$$PATH
-MAKE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1"
+MAKE_ENV+= "QTDIR=${QT1DIR}/qt1"
do-install:
@${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \
${PREFIX}/lib
- @qt1dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`; \
+ @qt1dir=${QT1DIR}; \
for file in ${QW_INCLUDES}; do \
${INSTALL_DATA} ${WRKSRC}/${FILE} $$qt1dir/qt1/include; \
done