diff options
| author | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-10-24 22:10:43 +0000 |
| commit | a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 (patch) | |
| tree | e280bcd13b77df59c664f968eda46414c756ada4 /graphics/gd | |
| parent | 452509b0a2eb744db237df7645a87161418d6935 (diff) | |
| download | pkgsrc-a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4.tar.gz | |
I am a triple idiot. The only relevant variable that x11.buildlink.mk
redefines about which buildlink.mk files would care is BUILDLINK_X11_DIR,
which points to the location of the X11R6 hierarchy used during building.
If x11.buildlink.mk isn't included, then BUILDLINK_X11_DIR defaults to
${X11BASE} (set in bsd.pkg.mk), so its value is always safe to use. Remove
the ifdefs surrounding the use of BUILDLINK_X11_DIR in tk/buildlink.mk and
revert changes to move x11.buildlink.mk before the other buildlink.mk files.
Diffstat (limited to 'graphics/gd')
| -rw-r--r-- | graphics/gd/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index ba99acb7ebf..bd0966de6dc 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2001/10/23 13:14:57 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2001/10/24 22:11:00 jlam Exp $ # FreeBSD Id: Makefile,v 1.2 1997/02/14 07:55:45 asami Exp # @@ -31,10 +31,10 @@ GD_MAJOR= 1 GD_MINOR= 9 MAKE_ENV+= GD_MAJOR="${GD_MAJOR}" GD_MINOR="${GD_MINOR}" COMPILER="${CC}" -.include "../../mk/x11.buildlink.mk" .include "../../devel/zlib/buildlink.mk" .include "../../graphics/freetype-lib/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |