diff options
| author | agc <agc> | 2000-07-10 15:08:13 +0000 |
|---|---|---|
| committer | agc <agc> | 2000-07-10 15:08:13 +0000 |
| commit | 759a1da38c400eb5e5378600820b8900fe956a9a (patch) | |
| tree | 4049372601c8df738c9d8100ec5b6c62cb36e7ae /games | |
| parent | eebfc40e204b2e2ecf7febe64eb4c275ab6ff2c6 (diff) | |
| download | pkgsrc-759a1da38c400eb5e5378600820b8900fe956a9a.tar.gz | |
Find qt1 prefix via pkg_info(1), rather than hardcoding it as ${X11BASE}.
Pointed out by Dave Sainty <dave@dtsp.co.nz>, munged slightly by me.
Diffstat (limited to 'games')
| -rw-r--r-- | games/amor/Makefile | 6 | ||||
| -rw-r--r-- | games/kdegames/Makefile | 4 | ||||
| -rw-r--r-- | games/kdetoys/Makefile | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/games/amor/Makefile b/games/amor/Makefile index 7ebf382c294..7af3f4b7a27 100644 --- a/games/amor/Makefile +++ b/games/amor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/04/12 22:08:59 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:16 agc Exp $ # DISTNAME= amor-0.6 @@ -13,7 +13,7 @@ DEPENDS+= kdebase-1.1.2:../../x11/kdebase USE_X11BASE= yes # To get this near KDE GNU_CONFIGURE= yes -CONFIGURE_ENV+= QTDIR=${X11BASE}/qt1 -CONFIGURE_ARGS+=--with-qt-dir=${X11BASE}/qt1 +CONFIGURE_ENV+= QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 +CONFIGURE_ARGS+=--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 .include "../../mk/bsd.pkg.mk" diff --git a/games/kdegames/Makefile b/games/kdegames/Makefile index 5c456e4b6b6..80e776a03a5 100644 --- a/games/kdegames/Makefile +++ b/games/kdegames/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2000/03/28 00:12:30 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.37 2000/07/10 15:08:17 agc Exp $ # FreeBSD Id: Makefile,v 1.3 1997/11/05 04:19:49 asami Exp # @@ -18,7 +18,7 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=${X11BASE}/qt1" + "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ CXXFLAGS="${CFLAGS}" \ diff --git a/games/kdetoys/Makefile b/games/kdetoys/Makefile index c1399904ccb..04d8adadcdb 100644 --- a/games/kdetoys/Makefile +++ b/games/kdetoys/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/04/24 14:14:12 tron Exp $ +# $NetBSD: Makefile,v 1.5 2000/07/10 15:08:17 agc Exp $ DISTNAME= kdetoys-1.1.2 CATEGORIES= games kde @@ -17,10 +17,10 @@ USE_X11BASE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= "--datadir=${PREFIX}/share/kde" \ - "--with-qt-dir=${X11BASE}/qt1" + "--with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1" CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ENV= KDEDIR=${PREFIX} \ - QTDIR=${X11BASE}/qt1 \ + QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib" |