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/imlib/Makefile | |
| 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/imlib/Makefile')
| -rw-r--r-- | graphics/imlib/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 570dd32ffed..ceffdc47018 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2001/10/23 13:14:59 jlam Exp $ +# $NetBSD: Makefile,v 1.60 2001/10/24 22:11:02 jlam Exp $ # DISTNAME= imlib-1.9.11 @@ -42,7 +42,6 @@ post-install: ${LN} -fs ${PREFIX}/share/aclocal/imlib.m4 \ ${LOCALBASE}/share/aclocal/imlib.m4 -.include "../../mk/x11.buildlink.mk" .include "../../devel/gettext-lib/buildlink.mk" .include "../../graphics/jpeg/buildlink.mk" .include "../../graphics/libungif/buildlink.mk" @@ -50,4 +49,5 @@ post-install: .include "../../graphics/png/buildlink.mk" .include "../../graphics/tiff/buildlink.mk" .include "../../x11/gtk/buildlink.mk" +.include "../../mk/x11.buildlink.mk" .include "../../mk/bsd.pkg.mk" |