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 /sysutils | |
| 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 'sysutils')
| -rw-r--r-- | sysutils/asapm/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/kapm/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/kdf/Makefile | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sysutils/asapm/Makefile b/sysutils/asapm/Makefile index 14fec8b451e..543846d97d2 100644 --- a/sysutils/asapm/Makefile +++ b/sysutils/asapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:45 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:25 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1998/11/29 12:43:12 asami Exp # @@ -21,7 +21,7 @@ GNU_CONFIGURE= yes USE_X11= yes CONFIGURE_ARGS+= --disable-jpeg # there actually is no JPEG support CONFIGURE_ARGS+= --with-xpm \ - --with-xpm-includes="`${MAKE} show-xpm-prefix`/include" \ - --with-xpm-library="`${MAKE} show-xpm-prefix`/lib" + --with-xpm-includes="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include" \ + --with-xpm-library="`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index 16052331400..7ad61c9319b 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -16,8 +16,8 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES -CONFIGURE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 -CONFIGURE_ENV+= MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc -CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 +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 .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile index 6b2ae5543c4..3e687b7cfb8 100644 --- a/sysutils/kdf/Makefile +++ b/sysutils/kdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:45 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:26 agc Exp $ # DISTNAME= kdf-0.5.1 @@ -14,13 +14,13 @@ DEPENDS+= kde-1.1.2:../../x11/kde USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \ - --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \ +CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \ + --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ - MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \ + QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ + MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" |