diff options
author | agc <agc@pkgsrc.org> | 2000-07-14 16:04:19 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2000-07-14 16:04:19 +0000 |
commit | 69cbb390716850e6a8c835f7b91ef8d8df65fb92 (patch) | |
tree | aa658f354e6a972c06b16f22e2cbf7898068e0c8 /x11 | |
parent | 06a57d66d0054c05fe01defeb25c312035a3d99e (diff) | |
download | pkgsrc-69cbb390716850e6a8c835f7b91ef8d8df65fb92.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 'x11')
-rw-r--r-- | x11/asclock-gtk/Makefile | 4 | ||||
-rw-r--r-- | x11/ebuilder/Makefile | 4 | ||||
-rw-r--r-- | x11/fvwm2/Makefile | 4 | ||||
-rw-r--r-- | x11/gdm/Makefile | 4 | ||||
-rw-r--r-- | x11/gtkglarea/Makefile | 4 | ||||
-rw-r--r-- | x11/kdebase/Makefile | 4 | ||||
-rw-r--r-- | x11/kdelibs/Makefile | 4 | ||||
-rw-r--r-- | x11/khostchooser/Makefile | 8 | ||||
-rw-r--r-- | x11/korganizer/Makefile | 6 | ||||
-rw-r--r-- | x11/kworldwatch/Makefile | 14 | ||||
-rw-r--r-- | x11/qtarch/Makefile | 4 | ||||
-rw-r--r-- | x11/qwspritefield/Makefile | 8 | ||||
-rw-r--r-- | x11/rxvt/Makefile | 6 | ||||
-rw-r--r-- | x11/scwm/Makefile | 4 | ||||
-rw-r--r-- | x11/xfce/Makefile | 6 | ||||
-rw-r--r-- | x11/xglobe/Makefile | 4 |
16 files changed, 44 insertions, 44 deletions
diff --git a/x11/asclock-gtk/Makefile b/x11/asclock-gtk/Makefile index db0908e5c92..91b92055b5e 100644 --- a/x11/asclock-gtk/Makefile +++ b/x11/asclock-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2000/07/11 14:53:45 agc Exp $ +# $NetBSD: Makefile,v 1.6 2000/07/14 16:04:26 agc Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -18,7 +18,7 @@ PLIST_SRC= ${PKGDIR}/PLIST \ ${PKGDIR}/PLIST.themes ALL_TARGET= asclock -MAKE_ENV+= CONFIG_PATH="`${MAKE} show-gtk+-prefix`/bin/" # for gtk-config +MAKE_ENV+= CONFIG_PATH="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`/bin/" # for gtk-config pre-configure: cd ${WRKSRC}; ${LN} -sf themes/classic default_theme diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 43fcb7039b7..5bb88016a36 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:46 agc Exp $ +# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:26 agc Exp $ # DISTNAME= ebuilder-0.56c @@ -13,7 +13,7 @@ DEPENDS+= qt2-*:../../x11/qt DEPENDS+= png-*:../../graphics/png USE_X11= yes -MAKE_ENV= QTDIR=`${MAKE} show-qt2-prefix`/qt2 +MAKE_ENV= QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile index deeecb11848..edf8462dd71 100644 --- a/x11/fvwm2/Makefile +++ b/x11/fvwm2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2000/07/11 14:53:46 agc Exp $ +# $NetBSD: Makefile,v 1.25 2000/07/14 16:04:26 agc Exp $ # FreeBSD Id: Makefile,v 1.12 1997/10/11 10:42:43 jkh Exp # @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-extras CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/lib/X11/fvwm2 CONFIGURE_ARGS+= --libexecdir=${PREFIX}/lib/X11 -CONFIGURE_ARGS+= --with-xpm-includes=`${MAKE} show-xpm-prefix`/include +CONFIGURE_ARGS+= --with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include CONFIGURE_ARGS+= --with-readline-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-rplay-includes=${LOCALBASE}/include CONFIGURE_ARGS+= --with-iconpath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11ROOT}/include/bitmaps:${X11ROOT}/include/pixmaps diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index f0d0f7402e1..82b61a5f9fa 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:46 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:27 agc Exp $ DISTNAME= gdm-2.0beta4 PKGNAME= gdm-2.0b4 @@ -62,7 +62,7 @@ post-build: cd ${WRKSRC}/config; \ ${RM} -f KDE Xsession; \ ${ECHO} '#! ${SH}' >KDE; \ - ${ECHO} "export KDEDIR=`${MAKE} show-kdebase-prefix`" >>KDE; \ + ${ECHO} "export KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`" >>KDE; \ ${ECHO} 'exec $${KDEDIR}/bin/startkde $$@' >>KDE; \ ${ECHO} '#! ${SH}' >Xsession; \ ${ECHO} 'exec ${X11BASE}/lib/X11/xdm/Xsession $$@' >>Xsession; \ diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile index fbc9fb06a33..5fbaca68a7c 100644 --- a/x11/gtkglarea/Makefile +++ b/x11/gtkglarea/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2000/07/11 14:53:46 agc Exp $ +# $NetBSD: Makefile,v 1.18 2000/07/14 16:04:27 agc Exp $ DISTNAME= gtkglarea-1.2.1 CATEGORIES= x11 graphics @@ -15,7 +15,7 @@ USE_LIBTOOL= # defined LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= # defined -CONFIGURE_ARGS+= --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" +CONFIGURE_ARGS+= --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" CONFIGURE_ARGS+= --with-GL-prefix=${X11BASE} CONFIGURE_ARGS+= --with-lib-MesaGL diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile index 411ec5ba3c3..89c9122083d 100644 --- a/x11/kdebase/Makefile +++ b/x11/kdebase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2000/07/11 14:53:46 agc Exp $ +# $NetBSD: Makefile,v 1.66 2000/07/14 16:04:27 agc Exp $ # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp DISTNAME= kdebase-1.1.2 @@ -25,7 +25,7 @@ USE_X11BASE= yes USE_GMAKE= 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" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/x11/kdelibs/Makefile b/x11/kdelibs/Makefile index 29f61622722..d6ef2d9ca76 100644 --- a/x11/kdelibs/Makefile +++ b/x11/kdelibs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2000/07/11 14:53:47 agc Exp $ +# $NetBSD: Makefile,v 1.49 2000/07/14 16:04:27 agc Exp $ # FreeBSD Id: Makefile,v 1.5 1997/11/27 00:25:46 se Exp # @@ -22,7 +22,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" CFLAGS+= -I${LOCALBASE}/include .include "../../mk/bsd.prefs.mk" diff --git a/x11/khostchooser/Makefile b/x11/khostchooser/Makefile index 8912853fc3d..7ccf865d813 100644 --- a/x11/khostchooser/Makefile +++ b/x11/khostchooser/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:47 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:27 agc Exp $ # DISTNAME= khostchooser-0.3 @@ -19,11 +19,11 @@ USE_X11BASE= yes USE_GMAKE= 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 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="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" diff --git a/x11/korganizer/Makefile b/x11/korganizer/Makefile index 974d824639c..a576bd6a655 100644 --- a/x11/korganizer/Makefile +++ b/x11/korganizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2000/07/11 14:53:47 agc Exp $ +# $NetBSD: Makefile,v 1.7 2000/07/14 16:04:28 agc Exp $ DISTNAME= korganizer-1.1.2 CATEGORIES= kde @@ -15,10 +15,10 @@ USE_X11BASE= yes USE_GMAKE= 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" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ + QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile index afca386c00c..72f2c24ec51 100644 --- a/x11/kworldwatch/Makefile +++ b/x11/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2000/07/11 14:53:47 agc Exp $ +# $NetBSD: Makefile,v 1.10 2000/07/14 16:04:28 agc Exp $ # DISTNAME= kworldwatch-0.6 @@ -15,14 +15,14 @@ CONFLICTS+= kdetoys-* USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${MAKE} show-kdebase-prefix`/share/kde \ - --with-qt-dir=`${MAKE} show-qt1-prefix`/qt1 \ - --with-qt-libraries='`${MAKE} show-qt1-prefix`/qt1/lib -L${LOCALBASE}/lib' \ +CONFIGURE_ARGS+=--datadir=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}`/share/kde \ + --with-qt-dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ + --with-qt-libraries='`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/lib -L${LOCALBASE}/lib' \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=`${MAKE} show-kdebase-prefix` \ - MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \ - QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ +CONFIGURE_ENV= KDEDIR=`${SHOW_PREFIX1} kdebase ${SHOW_PREFIX2}` \ + MOC=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin/moc \ + QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile index e3f59feb406..2d49b43438e 100644 --- a/x11/qtarch/Makefile +++ b/x11/qtarch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2000/07/11 14:53:47 agc Exp $ +# $NetBSD: Makefile,v 1.4 2000/07/14 16:04:28 agc Exp $ # DISTNAME= qtarch-2.0-1 @@ -16,7 +16,7 @@ DEPENDS+= png-*:../../graphics/png USE_X11= yes USE_GMAKE= yes -MAKE_ENV= QTDIR=`${MAKE} show-qt2-prefix`/qt2 +MAKE_ENV= QTDIR=`${SHOW_PREFIX1} qt2 ${SHOW_PREFIX2}`/qt2 PATH= ${QTDIR}/bin:$$PATH do-install: diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile index c79943c187b..99376efa014 100644 --- a/x11/qwspritefield/Makefile +++ b/x11/qwspritefield/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2000/07/11 14:53:48 agc Exp $ +# $NetBSD: Makefile,v 1.8 2000/07/14 16:04:28 agc Exp $ DISTNAME= QwSpriteField1.6 PKGNAME= qwspritefield-1.6 @@ -18,14 +18,14 @@ WRKSRC= ${WRKDIR}/QwSpriteField QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h -PATH= `${MAKE} show-qt1-prefix`/qt1/bin:$$PATH +PATH= `${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1/bin:$$PATH -MAKE_ENV+= "QTDIR=`${MAKE} show-qt1-prefix`/qt1" +MAKE_ENV+= "QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1" do-install: @${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/libQwSpriteField.la \ ${PREFIX}/lib - @qt1dir=`${MAKE} show-qt1-prefix`; \ + @qt1dir=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`; \ for file in ${QW_INCLUDES}; do \ ${INSTALL_DATA} ${WRKSRC}/${FILE} $$qt1dir/qt1/include; \ done diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile index d1726239673..55e37f5acab 100644 --- a/x11/rxvt/Makefile +++ b/x11/rxvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/07/11 14:53:48 agc Exp $ +# $NetBSD: Makefile,v 1.16 2000/07/14 16:04:28 agc Exp $ # FreeBSD Id: Makefile,v 1.13 1997/03/07 12:29:49 obrien Exp # @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-utmp \ --enable-frills \ --enable-keepscrolling \ --enable-mousewheel \ - --with-xpm-includes=`${MAKE} show-xpm-prefix`/include/X11 \ - --with-xpm-library=`${MAKE} show-xpm-prefix`/lib + --with-xpm-includes=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/include/X11 \ + --with-xpm-library=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}`/lib .include "../../mk/bsd.pkg.mk" diff --git a/x11/scwm/Makefile b/x11/scwm/Makefile index d02a4870658..0a60402a557 100644 --- a/x11/scwm/Makefile +++ b/x11/scwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/07/11 14:53:48 agc Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/14 16:04:30 agc Exp $ # DISTNAME= scwm-0.9 @@ -15,7 +15,7 @@ DEPENDS+= readline-4.0:../../devel/readline DEPENDS+= xpm-3.4k:../../graphics/xpm CONFIGURE_ARGS+= --with-guile-prefix=${LOCALBASE} \ - --with-gtk-prefix="`${MAKE} show-gtk+-prefix`" \ + --with-gtk-prefix="`${SHOW_PREFIX1} gtk+ ${SHOW_PREFIX2}`" \ --enable-multibyte USE_X11BASE= yes diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile index 4c9ee39803b..83e9b302bca 100644 --- a/x11/xfce/Makefile +++ b/x11/xfce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/11 14:53:48 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/14 16:04:30 agc Exp $ DISTNAME= xfce-3.3.1 CATEGORIES= x11 @@ -18,8 +18,8 @@ GNU_CONFIGURE= yes CONFIGURE_ENV+= XFCE_LOCALE_DIR=${PREFIX}/share/locale CONFIGURE_ARGS+=--without-included-gettext \ --datadir=${PREFIX}/share \ - --with-imlib=`${MAKE} show-imlib-prefix` \ - --with-xpm=`${MAKE} show-xpm-prefix` + --with-imlib=`${SHOW_PREFIX1} imlib ${SHOW_PREFIX2}` \ + --with-xpm=`${SHOW_PREFIX1} xpm ${SHOW_PREFIX2}` USE_GMAKE= yes .include "../../mk/bsd.pkg.mk" diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile index 5815bd7bce3..444c6c1e298 100644 --- a/x11/xglobe/Makefile +++ b/x11/xglobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2000/07/11 14:53:48 agc Exp $ +# $NetBSD: Makefile,v 1.14 2000/07/14 16:04:30 agc Exp $ # DISTNAME= xglobe-0.5 @@ -24,7 +24,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} USE_X11BASE= YES USE_GMAKE= YES -MAKE_ENV+= QTDIR=`${MAKE} show-qt1-prefix`/qt1 +MAKE_ENV+= QTDIR=`${SHOW_PREFIX1} qt1 ${SHOW_PREFIX2}`/qt1 post-install: ${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe |