diff options
| author | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-08-25 18:38:05 +0000 |
| commit | e2afa97f51a1f72e6618533019aaaae07b7d3cf2 (patch) | |
| tree | d2b31bb9a6a069ebfb63079b9dddde1e6688bc4b /x11/qt3-libs/Makefile | |
| parent | e97ad43756dc8382d2c6cb8a7ae09be0eb540f67 (diff) | |
| download | pkgsrc-e2afa97f51a1f72e6618533019aaaae07b7d3cf2.tar.gz | |
Merge changes in packages from the buildlink2 branch that have
buildlink2.mk files back into the main trunk. This provides sufficient
buildlink2 infrastructure to start merging other packages from the
buildlink2 branch that have already been converted to use the buildlink2
framework.
Diffstat (limited to 'x11/qt3-libs/Makefile')
| -rw-r--r-- | x11/qt3-libs/Makefile | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile index 892a3f38dc3..df0ac57fbd6 100644 --- a/x11/qt3-libs/Makefile +++ b/x11/qt3-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2002/08/08 16:17:08 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2002/08/25 18:40:44 jlam Exp $ # .include "../qt3-libs/Makefile.common" @@ -7,8 +7,7 @@ PKGNAME= qt3-libs-${QTVERSION} PKGREVISION= 2 COMMENT= C++ X GUI toolkit -USE_BUILDLINK_ONLY= yes -BUILDLINK_QTDIR= ${WRKSRC} +USE_BUILDLINK2= yes MAKE_ENV+= LIBQT="${WRKSRC}/lib/libqt-mt.la" @@ -26,7 +25,7 @@ do-install: ${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/bin/moc ${QTPREFIX}/bin ${INSTALL_DATA_DIR} ${QTPREFIX}/lib - ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib + ${PKGLIBTOOL} ${INSTALL_DATA} ${WRKSRC}/lib/libqt-mt.la ${QTPREFIX}/lib ${INSTALL_DATA_DIR} ${QTPREFIX}/include ${INSTALL_DATA} ${WRKSRC}/include/*.h ${QTPREFIX}/include ${INSTALL_DATA_DIR} ${QTPREFIX}/include/private @@ -36,12 +35,12 @@ do-install: ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqjpeg.la ${QTPREFIX}/plugins/imageformats ${LIBTOOL} ${INSTALL_DATA} ${WRKSRC}/plugins/imageformats/libqmng.la ${QTPREFIX}/plugins/imageformats -.include "../../devel/zlib/buildlink.mk" -.include "../../graphics/jpeg/buildlink.mk" -.include "../../graphics/Mesa/buildlink.mk" -.include "../../graphics/mng/buildlink.mk" -.include "../../graphics/png/buildlink.mk" -.include "../../graphics/freetype2/buildlink.mk" -.include "../../mk/pthread.buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/mng/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" +.include "../../mk/pthread.buildlink2.mk" + .include "../../mk/bsd.pkg.mk" |