diff options
| author | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-08-29 22:41:00 +0000 |
| commit | b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae (patch) | |
| tree | 0943c3791afa0b712d3818b69672014acfe55e03 /x11/gtk | |
| parent | 68d93d0286e46619b54c9d917dbf553bc889a6e5 (diff) | |
| download | pkgsrc-b1cf2d6a0d781b36b3e41c1761bd09b0d1e714ae.tar.gz | |
Use x11.buildlink.mk instead of USE_X11. Also convert hard-coded references
to ${X11BASE} in the header and library search paths into references to
${LOCALBASE}/share/x11-links. These packages should now be strongly-
buildlinked regardless of whether xpkgwedge is installed.
Changes well-tested on NetBSD-1.5X/i386 with and without xpkgwedge and
lightly-tested on NetBSD-1.5.1/alpha without xpkgwedge.
Diffstat (limited to 'x11/gtk')
| -rw-r--r-- | x11/gtk/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile index 0c26238acf0..1796444c20f 100644 --- a/x11/gtk/Makefile +++ b/x11/gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.64 2001/06/29 04:54:56 jlam Exp $ +# $NetBSD: Makefile,v 1.65 2001/08/29 22:41:29 jlam Exp $ DISTNAME= gtk+-1.2.10 CATEGORIES= x11 @@ -34,7 +34,7 @@ PLIST_SUBST+= LOCALBASE=${LOCALBASE} # The following ensures that `gtk-config --libs' includes the correct linker # flags for linking the X11 libs. # -X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${X11BASE}/lib +X_LDFLAGS= -Wl,-R${X11BASE}/lib -L${BUILDLINK_X11_DIR}/lib GTK_VERSION= ${DISTNAME:S/gtk+-//} GTK_MAJOR_VERSION= ${GTK_VERSION:C/\..*//} @@ -66,4 +66,5 @@ post-install: .include "../../devel/gettext-lib/buildlink.mk" .include "../../devel/glib/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |