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/gnome-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/gnome-libs/Makefile')
-rw-r--r-- | x11/gnome-libs/Makefile | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index dc077480d53..0e2b2ce2af7 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.76 2002/03/24 19:53:40 rh Exp $ +# $NetBSD: Makefile,v 1.77 2002/08/25 18:40:30 jlam Exp $ DISTNAME= gnome-libs-1.4.1.4 CATEGORIES= x11 gnome @@ -23,7 +23,7 @@ CONFIGURE_ENV+= LOCALBASE=${LOCALBASE} \ X11BASE=${X11BASE} \ PKGLOCALEDIR=${PKGLOCALEDIR} -USE_BUILDLINK_ONLY= YES +USE_BUILDLINK2= YES LOCALSTATEDIR= /var/gnome PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ @@ -33,9 +33,9 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} \ .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" -.include "../../databases/db/buildlink.mk" +. include "../../databases/db/buildlink2.mk" -CPPFLAGS+= -I${BUILDLINK_DIR}/include/db2 +CPPFLAGS+= -I${BUILDLINK_PREFIX.db}/include/db2 pre-configure: ${MV} ${WRKSRC}/configure ${WRKSRC}/configure-pre-db-sub && \ @@ -63,11 +63,11 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/libart.m4 \ ${LOCALBASE}/share/aclocal/libart.m4 -.include "../../audio/esound/buildlink.mk" -.include "../../devel/gettext-lib/buildlink.mk" -.include "../../graphics/imlib/buildlink.mk" -.include "../../graphics/xpm/buildlink.mk" -.include "../../net/ORBit/buildlink.mk" -.include "../../x11/gtk/buildlink.mk" -.include "../../mk/x11.buildlink.mk" +.include "../../audio/esound/buildlink2.mk" +.include "../../devel/gettext-lib/buildlink2.mk" +.include "../../graphics/imlib/buildlink2.mk" +.include "../../graphics/xpm/buildlink2.mk" +.include "../../net/ORBit/buildlink2.mk" +.include "../../x11/gtk/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" |