summaryrefslogtreecommitdiff
path: root/x11/wmfire
diff options
context:
space:
mode:
authorjlam <jlam>2001-10-24 22:10:43 +0000
committerjlam <jlam>2001-10-24 22:10:43 +0000
commit973189f9135fdd558ae1245181918d2289fce5b4 (patch)
treee280bcd13b77df59c664f968eda46414c756ada4 /x11/wmfire
parentb145cb827667e8b409e5f0d7abcfb1570bff7d25 (diff)
downloadpkgsrc-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 'x11/wmfire')
-rw-r--r--x11/wmfire/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/x11/wmfire/Makefile b/x11/wmfire/Makefile
index 5cb88b18a25..23cc590ec68 100644
--- a/x11/wmfire/Makefile
+++ b/x11/wmfire/Makefile
@@ -1,4 +1,4 @@
-#$NetBSD: Makefile,v 1.9 2001/10/23 13:15:10 jlam Exp $
+#$NetBSD: Makefile,v 1.10 2001/10/24 22:11:15 jlam Exp $
#
DISTNAME= wmfire-0.0.3.8
@@ -19,6 +19,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/wmfire
${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/wmfire
-.include "../../mk/x11.buildlink.mk"
.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"