diff options
| author | agc <agc@pkgsrc.org> | 2000-07-10 16:03:47 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-10 16:03:47 +0000 |
| commit | f1bc5a3e73685c7a23afff38d607dbfdfacb7b6f (patch) | |
| tree | d18e88610f0e1610a6df0707db9f9f25f547acdb | |
| parent | 52c1afc38c6c1387969433578010efd90e8e3278 (diff) | |
| download | pkgsrc-f1bc5a3e73685c7a23afff38d607dbfdfacb7b6f.tar.gz | |
Find qt2 prefix via pkg_info(1), rather than hardcoding it as ${X11BASE}.
Pointed out by Dave Sainty <dave@dtsp.co.nz>, munged slightly by me.
| -rw-r--r-- | cad/vipec/Makefile | 6 | ||||
| -rw-r--r-- | games/nethack-qt/Makefile | 6 | ||||
| -rw-r--r-- | x11/ebuilder/Makefile | 4 | ||||
| -rw-r--r-- | x11/qtarch/Makefile | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile index 6b68af91bdf..c6d1003f021 100644 --- a/cad/vipec/Makefile +++ b/cad/vipec/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2000/06/01 11:23:16 rh Exp $ +# $NetBSD: Makefile,v 1.12 2000/07/10 16:03:47 agc Exp $ # DISTNAME= vipec-2.0.1 @@ -14,9 +14,9 @@ GNU_CONFIGURE= yes USE_PKGLIBTOOL= yes USE_X11= yes -CONFIGURE_ENV+= "QTDIR=${X11BASE}/qt2" \ +CONFIGURE_ENV+= "QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{ print $$2 }'`/qt2" \ all_libraries="-Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib -Wl,-R${X11BASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS+= "--with-qt-dir=${X11BASE}/qt2" +CONFIGURE_ARGS+= "--with-qt-dir=`${PKG_INFO} -qp qt2 | ${AWK} '{ print $$2 }'`/qt2" post-extract: ${MV} -f ${WRKSRC}/bin/start_vipec_help ${WRKSRC}/bin/start_vipec_help.in diff --git a/games/nethack-qt/Makefile b/games/nethack-qt/Makefile index c062a2ebf80..714171a96e7 100644 --- a/games/nethack-qt/Makefile +++ b/games/nethack-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2000/04/28 10:12:43 drochner Exp $ +# $NetBSD: Makefile,v 1.16 2000/07/10 16:03:48 agc Exp $ # DISTNAME= nethack-3.3.0 @@ -21,8 +21,8 @@ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./sys/unix/setup.sh ALL_TARGET= x11tiles nethack INSTALL_TARGET= binfiles -PATH= ${X11BASE}/qt2/bin:$$PATH -MAKE_ENV+= GTYPE=-qt QTDIR=${X11BASE}/qt2 +PATH= `${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2/bin:$$PATH +MAKE_ENV+= GTYPE=-qt QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2 PATCHFILES+= ${PKGSRCDIR}/games/nethack-lib/patches/patch-* ALLFILES= ${DISTFILES} # don't checksum shared patches diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile index 5cfac8966ac..45911500e2d 100644 --- a/x11/ebuilder/Makefile +++ b/x11/ebuilder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/04/28 18:14:01 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2000/07/10 16:03:49 agc Exp $ # DISTNAME= ebuilder-0.56c @@ -13,7 +13,7 @@ DEPENDS+= qt2-*:../../x11/qt DEPENDS+= png-*:../../graphics/png USE_X11= yes -MAKE_ENV= QTDIR=${X11BASE}/qt2 +MAKE_ENV= QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/ebuilder ${PREFIX}/bin diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile index b1ff8125afd..163d0fdc2af 100644 --- a/x11/qtarch/Makefile +++ b/x11/qtarch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2000/04/28 20:31:43 drochner Exp $ +# $NetBSD: Makefile,v 1.2 2000/07/10 16:03:49 agc Exp $ # DISTNAME= qtarch-2.0-1 @@ -16,7 +16,7 @@ DEPENDS+= png-*:../../graphics/png USE_X11= yes USE_GMAKE= yes -MAKE_ENV= QTDIR=${X11BASE}/qt2 +MAKE_ENV= QTDIR=`${PKG_INFO} -qp qt2 | ${AWK} '{print $$2}'`/qt2 PATH= ${QTDIR}/bin:$$PATH do-install: |