diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-03-30 21:45:10 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-03-30 21:45:10 +0000 |
| commit | 311bc2c110e6e80cf6b55df1af9bfe87987be1dc (patch) | |
| tree | 13dcd3ffc53fa4f276a71a78a281a589fb938815 /x11 | |
| parent | 4726bc5989534fceefc6c1445fa0b3075c1bdf8c (diff) | |
| download | pkgsrc-311bc2c110e6e80cf6b55df1af9bfe87987be1dc.tar.gz | |
Remove XFree86/Makefile.common which was causing strange changes in the
targets, and use ${LOCALBASE}/X11R6 instead of ${X11ROOT}, noted by
Jeremy C. Reed (fixes building in qt3 when using X11_TYPE=XFree86).
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/XFree86-libs/buildlink2.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/x11/XFree86-libs/buildlink2.mk b/x11/XFree86-libs/buildlink2.mk index 9284a95167f..81213bc30df 100644 --- a/x11/XFree86-libs/buildlink2.mk +++ b/x11/XFree86-libs/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/03/30 21:26:40 xtraeme Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/03/30 21:45:10 xtraeme Exp $ # # This Makefile fragment is included by packages that use XFree86-libs. # @@ -8,14 +8,12 @@ .if !defined(XFREE86_LIBS_BUILDLINK2_MK) XFREE86_LIBS_BUILDLINK2_MK= # defined -.include "../../meta-pkgs/XFree86/Makefile.common" - BUILDLINK_PACKAGES+= XFree86-libs BUILDLINK_DEPENDS.XFree86-libs?= XFree86-libs>=4.4.0 BUILDLINK_PKGSRCDIR.XFree86-libs?= ../../x11/XFree86-libs EVAL_PREFIX+= BUILDLINK_PREFIX.XFree86-libs=XFree86-libs -BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${X11ROOT} +BUILDLINK_PREFIX.XFree86-libs_DEFAULT= ${LOCALBASE}/X11R6 BUILDLINK_FILES.XFree86-libs+= include/DPS/*.h BUILDLINK_FILES.XFree86-libs+= include/GL/*.h BUILDLINK_FILES.XFree86-libs+= include/X11/*.h |