From 99e9734c1322552385b4029f09f3dc349f4a2510 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. --- sysutils/kapm/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sysutils/kapm') diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index 7ad61c9319b..b12ddb2ddd5 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/15 20:39:24 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -16,8 +16,10 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES -CONFIGURE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 -CONFIGURE_ENV+= MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc -CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 + +EVAL_PREFIX+= QT1DIR=qt1 +CONFIGURE_ENV+= QTDIR=${QT1DIR}/qt1 +CONFIGURE_ENV+= MOC=${QT1DIR}/qt1/bin/moc +CONFIGURE_ARGS+=--with-qt-dir=${QT1DIR}/qt1 .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3