From 78748d628ac4db618c18ea933eb98fe9246df465 Mon Sep 17 00:00:00 2001 From: agc Date: Sat, 15 Jul 2000 20:39:13 +0000 Subject: Instead of the clunky SHOW_PKG_PREFIX, introduce an EVAL_PREFIX definition, which takes entries of the format =. 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. --- x11/qwspritefield/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'x11/qwspritefield') 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 -- cgit v1.2.3