summaryrefslogtreecommitdiff
path: root/devel/GConf
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-10-24 22:10:43 +0000
committerjlam <jlam@pkgsrc.org>2001-10-24 22:10:43 +0000
commita4bc16d30c123e03c4125fdd70bde0eb8a71f4a4 (patch)
treee280bcd13b77df59c664f968eda46414c756ada4 /devel/GConf
parent452509b0a2eb744db237df7645a87161418d6935 (diff)
downloadpkgsrc-a4bc16d30c123e03c4125fdd70bde0eb8a71f4a4.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 'devel/GConf')
-rw-r--r--devel/GConf/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/GConf/Makefile b/devel/GConf/Makefile
index d8557979ee2..756a40d59dc 100644
--- a/devel/GConf/Makefile
+++ b/devel/GConf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2001/10/23 13:14:49 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2001/10/24 22:10:50 jlam Exp $
#
DISTNAME= GConf-1.0.4
@@ -30,8 +30,8 @@ post-install:
${CP} -p ${PREFIX}/etc/gconf/1/path.example \
${PREFIX}/etc/gconf/1/path
-.include "../../mk/x11.buildlink.mk"
.include "../../devel/gettext-lib/buildlink.mk"
.include "../../databases/db3/buildlink.mk"
.include "../../devel/oaf/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"