diff options
author | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
commit | 973189f9135fdd558ae1245181918d2289fce5b4 (patch) | |
tree | e280bcd13b77df59c664f968eda46414c756ada4 /graphics/php4-gd | |
parent | b145cb827667e8b409e5f0d7abcfb1570bff7d25 (diff) | |
download | pkgsrc-973189f9135fdd558ae1245181918d2289fce5b4.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/php4-gd')
-rw-r--r-- | graphics/php4-gd/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile index 08ec7d4f7c2..d6766896ef1 100644 --- a/graphics/php4-gd/Makefile +++ b/graphics/php4-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2001/10/24 22:11:02 jlam Exp $ .include "../../www/php4/Makefile.module" @@ -18,6 +18,6 @@ CONFIGURE_ARGS+= --with-ttf=shared,${BUILDLINK_DIR} CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf CONFIGURE_ARGS+= --without-t1lib -.include "../../mk/x11.buildlink.mk" .include "../../graphics/gd/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |