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 /net | |
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 'net')
-rw-r--r-- | net/ethereal/Makefile | 4 | ||||
-rw-r--r-- | net/gtk-gnutella/Makefile | 4 | ||||
-rw-r--r-- | net/kdenetwork/Makefile | 4 | ||||
-rw-r--r-- | net/kmap/Makefile | 6 | ||||
-rw-r--r-- | net/kxicq/Makefile | 6 | ||||
-rw-r--r-- | net/xtraceroute/Makefile | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 575f24b0146..f7ab3747887 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2000/07/11 14:53:43 agc Exp $ +# $NetBSD: Makefile,v 1.28 2000/07/14 16:04:24 agc Exp $ # DISTNAME= ethereal-0.8.10 @@ -13,6 +13,6 @@ BUILD_DEPENDS+= ${LOCALBASE}/bin/perl:../../lang/perl5 USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" .include "../../mk/bsd.pkg.mk" diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile index 460c956cfe8..ef85e609a08 100644 --- a/net/gtk-gnutella/Makefile +++ b/net/gtk-gnutella/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:44 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:24 agc Exp $ # DISTNAME= gtk-gnutella-0.12 @@ -14,6 +14,6 @@ DEPENDS= gtk+-1.2.*:../../x11/gtk USE_GMAKE= yes USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" .include "../../mk/bsd.pkg.mk" diff --git a/net/kdenetwork/Makefile b/net/kdenetwork/Makefile index d6b329b0399..b0fa7b6ccdf 100644 --- a/net/kdenetwork/Makefile +++ b/net/kdenetwork/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2000/07/11 14:53:44 agc Exp $ +# $NetBSD: Makefile,v 1.46 2000/07/14 16:04:25 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:54 asami Exp # @@ -24,7 +24,7 @@ USE_PKGLIBTOOL= yes LIBTOOL_FLAGS= --cplusplus --install-la GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1" + "--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" CONFIGURE_ENV= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ diff --git a/net/kmap/Makefile b/net/kmap/Makefile index 1749ea4c7cd..1ad129d90f1 100644 --- a/net/kmap/Makefile +++ b/net/kmap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/07/11 14:53:44 agc Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/14 16:04:25 agc Exp $ # DISTNAME= kmap-0.5.6 @@ -13,8 +13,8 @@ DEPENDS+= nmap-2.12:../../net/nmap USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 -CONFIGURE_ARGS+=--with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 +CONFIGURE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 +CONFIGURE_ARGS+=--with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 post-patch: cd ${WRKSRC}/kmap ; \ diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile index 1271c37ae15..8cffe376a62 100644 --- a/net/kxicq/Makefile +++ b/net/kxicq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:44 agc Exp $ +# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:25 agc Exp $ DISTNAME= kxicq-03132000 CATEGORIES= net kde @@ -16,11 +16,11 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --datadir=${PREFIX}/share/kde \ - --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 + --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 CONFIGURE_ENV+= KDEDIR=${PREFIX} \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CFLAGS}" \ - all_libraries="-Wl,-R`${MAKE} show-qt1-prefix`/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz" + all_libraries="-Wl,-R`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -ltiff -ljpeg -lpng -lz" post-extract: @${RM} -fr ${WRKSRC}/kxicq/ltdl diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 2f32eaf987c..585549abbcd 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2000/07/11 14:53:45 agc Exp $ +# $NetBSD: Makefile,v 1.13 2000/07/14 16:04:25 agc Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -15,7 +15,7 @@ DEPENDS+= tiff-*:../../graphics/tiff USE_X11= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" # XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE # and xtraceroute doesn't have a switch to tell it so (yet?), we abuse # the --with-GL-prefix switch for this. |