diff options
author | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
---|---|---|
committer | jlam <jlam> | 2001-10-24 22:10:43 +0000 |
commit | 9d18cbcf3d344d366ec69d93d4b07cfec98c8420 (patch) | |
tree | e280bcd13b77df59c664f968eda46414c756ada4 /graphics/libwmf | |
parent | a2d21cd479d03393f90038ec217263fd6e918fbe (diff) | |
download | pkgsrc-9d18cbcf3d344d366ec69d93d4b07cfec98c8420.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/libwmf')
-rw-r--r-- | graphics/libwmf/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 1928c3209cb..a3835d7c588 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2001/10/24 22:11:02 jlam Exp $ # DISTNAME= libwmf-0.2.1 @@ -20,9 +20,9 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig INCLUDEDIR= ${PREFIX}/include/libwmf HTMLDIR= ${PREFIX}/share/doc/html/libwmf -.include "../../mk/x11.buildlink.mk" .include "../../graphics/freetype2/buildlink.mk" .include "../../graphics/png/buildlink.mk" .include "../../graphics/xpm/buildlink.mk" .include "../../textproc/libxml2/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |