summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2008-02-04 17:46:13 +0000
committertnn <tnn@pkgsrc.org>2008-02-04 17:46:13 +0000
commit7d1989c3c8bf005273f115c42f4ed7d50043a92d (patch)
tree56205f57f820c288aa705982e606259da8fe55b7 /x11
parent22d1b7ff78a1b3c9f295f404f54e1fbf3d951f33 (diff)
downloadpkgsrc-7d1989c3c8bf005273f115c42f4ed7d50043a92d.tar.gz
Move inclusion of graphics/glu/buildlink3.mk from Makefile to
Makefile.common. This should hopefully fix x11/wxGTK-contrib from failing: checking for -lGLU... no checking for -lMesaGL... no configure: error: OpenGL libraries not available XXX: buildlink3.mk doesn't include glu, is that really OK?
Diffstat (limited to 'x11')
-rw-r--r--x11/wxGTK/Makefile3
-rw-r--r--x11/wxGTK/Makefile.common3
2 files changed, 3 insertions, 3 deletions
diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index e39646f5b6f..581b2a42e62 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2007/01/16 23:27:48 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2008/02/04 17:46:13 tnn Exp $
#
.include "Makefile.common"
@@ -21,6 +21,5 @@ post-install:
${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DESTDIR}${DOCDIR}/LICENSE
-.include "../../graphics/glu/buildlink3.mk"
.include "../../mk/oss.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index c7e56c5ee33..0873e8cf68c 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2007/08/13 23:10:04 salo Exp $
+# $NetBSD: Makefile.common,v 1.16 2008/02/04 17:46:13 tnn Exp $
#
DISTNAME= wxGTK-2.6.3
@@ -45,6 +45,7 @@ DOCDIR= ${PREFIX}/share/doc/wxGTK
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/jpeg/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../graphics/tiff/buildlink3.mk"