summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2001-09-08 19:52:30 +0000
committerjlam <jlam@pkgsrc.org>2001-09-08 19:52:30 +0000
commit78934af22c1e8f6792288881e765d7cad503a47b (patch)
tree58aa3ce76ee2e168af92b4b9bd08ea165ee24aca /x11
parent39c550cbff397c93d5e3db0910a82a2b0ad1048f (diff)
downloadpkgsrc-78934af22c1e8f6792288881e765d7cad503a47b.tar.gz
Separate out the Motif-checking logic from lesstif/buildlink.mk into a
separate file mk/motif.buildlink.mk.
Diffstat (limited to 'x11')
-rw-r--r--x11/lesstif/buildlink.mk41
1 files changed, 2 insertions, 39 deletions
diff --git a/x11/lesstif/buildlink.mk b/x11/lesstif/buildlink.mk
index da54bffddc9..42089f25f4d 100644
--- a/x11/lesstif/buildlink.mk
+++ b/x11/lesstif/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.6 2001/07/27 13:33:38 jlam Exp $
+# $NetBSD: buildlink.mk,v 1.7 2001/09/08 19:52:31 jlam Exp $
#
# This Makefile fragment is included by packages that use lesstif.
#
@@ -18,37 +18,7 @@ LESSTIF_BUILDLINK_MK= # defined
.include "../../mk/bsd.buildlink.mk"
BUILDLINK_DEPENDS.lesstif?= lesstif>=0.91.4
-
-.include "../../mk/bsd.prefs.mk"
-
-# On Solaris, assume that /usr/dt contains a valid Motif 2.0-compatible
-# installation.
-#
-.if ${OPSYS} == "SunOS"
-_NEED_LESSTIF= NO
-.else
-.if exists(${X11BASE}/include/Xm/Xm.h)
-_IS_LESSTIF!= ${EGREP} -c LESSTIF ${X11BASE}/include/Xm/Xm.h || ${TRUE}
-.if ${_IS_LESSTIF} == "0"
-_NEED_LESSTIF= NO
-.else
-_NEED_LESSTIF= YES
-.endif
-.else
-_NEED_LESSTIF= YES
-.endif
-.endif
-
-.if ${_NEED_LESSTIF} == "YES"
-MOTIFBASE?= ${X11PREFIX}
DEPENDS+= ${BUILDLINK_DEPENDS.lesstif}:../../x11/lesstif
-.else
-.if ${OPSYS} == "SunOS"
-MOTIFBASE?= /usr/dt
-.else
-MOTIFBASE?= ${X11BASE}
-.endif
-.endif
EVAL_PREFIX+= BUILDLINK_PREFIX.lesstif=lesstif
BUILDLINK_PREFIX.lesstif_DEFAULT= ${X11PREFIX}
@@ -62,14 +32,7 @@ BUILDLINK_FILES.lesstif+= lib/libXm.*
BUILDLINK_TARGETS.lesstif= lesstif-buildlink
BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.lesstif}
-USE_X11= # defined
-MAKE_ENV+= MOTIFLIB="${MOTIFLIB}"
-LDFLAGS+= -Wl,-R${MOTIFBASE}/lib
-.if defined(USE_BUILDLINK_X11)
-MOTIFLIB?= -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -lXm -lXp
-.else
-MOTIFLIB?= -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -L${X11BASE}/lib -lXm -lXp
-.endif
+MOTIFBASE= ${BUILDLINK_PREFIX.lesstif}
pre-configure: ${BUILDLINK_TARGETS.lesstif}
lesstif-buildlink: _BUILDLINK_USE