summaryrefslogtreecommitdiff
path: root/news/pan/Makefile
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 /news/pan/Makefile
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 'news/pan/Makefile')
-rw-r--r--news/pan/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/news/pan/Makefile b/news/pan/Makefile
index e4e990a3686..77d78b84f5f 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/10/23 13:15:01 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/10/24 22:11:05 jlam Exp $
#
DISTNAME= pan-0.10.0.93
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ENV+= LOCALEDIR="${PKGLOCALEDIR}"
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
-.include "../../mk/x11.buildlink.mk"
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../x11/gnome-core/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"