summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-11-14 13:06:25 +0000
committerjlam <jlam@pkgsrc.org>2001-11-14 13:06:25 +0000
commit391b0ad75c9d093a8b1306ba38637e59ff8c0492 (patch)
treeb2578f69893a7ba1a18e4af74764e9ce95a7ae77
parent7e703bf189216e6fc2fce194e2c15d6997d4dfaa (diff)
downloadpkgsrc-391b0ad75c9d093a8b1306ba38637e59ff8c0492.tar.gz
Wrap default values in a check for USE_BUILDLINK_ONLY, otherwise these
values are immediately used within buildlink.mk, even though the values are overridden in another file that is included later. This behaviour occurs on make(1) from 20010826 userland.
-rw-r--r--x11/kde2/buildlink.mk11
1 files changed, 6 insertions, 5 deletions
diff --git a/x11/kde2/buildlink.mk b/x11/kde2/buildlink.mk
index c25c9702383..79450508089 100644
--- a/x11/kde2/buildlink.mk
+++ b/x11/kde2/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2001/11/13 21:08:56 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.2 2001/11/14 13:06:25 jlam Exp $
#
# This Makefile fragment is included by packages that use the KDE2
# configure-and-build process.
@@ -55,16 +55,18 @@ KDE2_BUILDLINK_MK= # defined
#
USE_X11BASE= YES
-# Default values so that even if the package using this file is not
+.if !defined(USE_BUILDLINK_ONLY)
+#
+# Default values so that even if the package using this file is not strongly
# buildlinkified, there are sensible values for finding the KDE2 and Qt2
# headers and libraries.
#
KDEDIR?= ${X11PREFIX}
-QTDIR?= ${X11PREFIX}
+QTDIR?= ${X11PREFIX}/qt2
BUILDLINK_KDEDIR?= ${KDEDIR}
BUILDLINK_QTDIR?= ${QTDIR}
+.endif
-.if defined(GNU_CONFIGURE)
CONFIGURE_ARGS+= --datadir="${KDEDIR}/share/kde"
CONFIGURE_ARGS+= --with-qt-dir="${BUILDLINK_QTDIR}"
CONFIGURE_ARGS+= --with-extra-includes="${_KDE2_EXTRA_INCLUDES}"
@@ -104,5 +106,4 @@ CONFIGURE_ENV+= kde_sounddir="${KDEDIR}/share/kde/sounds"
CONFIGURE_ENV+= kde_templatesdir="${KDEDIR}/share/kde/templates"
CONFIGURE_ENV+= kde_toolbardir="${KDEDIR}/share/kde/toolbar"
CONFIGURE_ENV+= kde_wallpaperdir="${KDEDIR}/share/kde/wallpapers"
-.endif # GNU_CONFIGURE
.endif # KDE2_BUILDLINK_MK