From 9d18cbcf3d344d366ec69d93d4b07cfec98c8420 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Wed, 24 Oct 2001 22:10:43 +0000
Subject: 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.

---
 print/xpdf/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'print/xpdf')

diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile
index 46175962371..36f576855f3 100644
--- a/print/xpdf/Makefile
+++ b/print/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/10/23 13:15:01 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2001/10/24 22:11:06 jlam Exp $
 # 
 
 DISTNAME=	xpdf-0.92
@@ -37,8 +37,8 @@ post-install:
 		${FILESDIR}/xpdf-app-defaults				\
 		> ${X11PREFIX}/lib/X11/app-defaults/Xpdf
 
-.include "../../mk/x11.buildlink.mk"
 .include "../../graphics/freetype-lib/buildlink.mk"
 .include "../../graphics/xpm/buildlink.mk"
 .include "../../textproc/t1lib/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3