diff options
author | agc <agc@pkgsrc.org> | 2000-07-11 14:53:35 +0000 |
---|---|---|
committer | agc <agc@pkgsrc.org> | 2000-07-11 14:53:35 +0000 |
commit | 4aeac45f89e5a02fffd8d4fe20e8af07012ec4cd (patch) | |
tree | 07c067a284dd27eed2ac53c0ec79e856fd2442d9 /x11/kworldwatch | |
parent | 2892ff05e14ce39877f3b9724d09c369fa16359e (diff) | |
download | pkgsrc-4aeac45f89e5a02fffd8d4fe20e8af07012ec4cd.tar.gz |
Make the determination of the pre-req package's installed directory be
a bit more user-friendly.
Introduce a show-{gtk+,imlib,kdebase,qt1,qt2,xpm}-prefix target in
bsd.pkg.mk, and use "${MAKE} show-*-prefix" in package Makefiles.
Diffstat (limited to 'x11/kworldwatch')
-rw-r--r-- | x11/kworldwatch/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/x11/kworldwatch/Makefile b/x11/kworldwatch/Makefile index 7891f2f0f38..afca386c00c 100644 --- a/x11/kworldwatch/Makefile +++ b/x11/kworldwatch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/07/11 10:58:34 agc Exp $ +# $NetBSD: Makefile,v 1.9 2000/07/11 14:53:47 agc Exp $ # DISTNAME= kworldwatch-0.6 @@ -15,14 +15,14 @@ CONFLICTS+= kdetoys-* USE_X11BASE= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--datadir=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'`/share/kde \ - --with-qt-dir=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ - --with-qt-libraries='`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/lib -L${LOCALBASE}/lib' \ +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' \ --enable-path-check CFLAGS+= -I${LOCALBASE}/include -CONFIGURE_ENV= KDEDIR=`${PKG_INFO} -qp kdebase | ${AWK} '{print $$2}'` \ - MOC=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1/bin/moc \ - QTDIR=`${PKG_INFO} -qp qt1 | ${AWK} '{ print $$2 }'`/qt1 \ +CONFIGURE_ENV= KDEDIR=`${MAKE} show-kdebase-prefix` \ + MOC=`${MAKE} show-qt1-prefix`/qt1/bin/moc \ + QTDIR=`${MAKE} show-qt1-prefix`/qt1 \ CXXFLAGS="${CFLAGS}" \ all_libraries="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib" |