diff options
| author | tron <tron> | 1999-10-05 22:18:05 +0000 |
|---|---|---|
| committer | tron <tron> | 1999-10-05 22:18:05 +0000 |
| commit | c6da4ac9dcaaf519e187e870e5fb2b967ed4344a (patch) | |
| tree | a05a947bffe8a47978124ec128099104b306a000 | |
| parent | 0c008842099b258b692bf6dd5047ecf47eab19fe (diff) | |
| download | pkgsrc-c6da4ac9dcaaf519e187e870e5fb2b967ed4344a.tar.gz | |
Support using a preinstalled Motif installation instead of Lesstif again.
| -rw-r--r-- | mk/bsd.pkg.mk | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 308371cc4b3..b9e9739d2c8 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.351 1999/10/05 15:48:26 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.352 1999/10/05 22:18:05 tron Exp $ # # This file is in the public domain. # @@ -118,15 +118,6 @@ USE_GTEXINFO= yes DEPENDS+= gtexinfo-3.12:${PKGSRCDIR}/devel/gtexinfo .endif -.if defined(USE_MOTIF) -.if exists(${X11BASE}/include/Xm/Xm.h) -RUN_DEPENDS+= ${X11BASE}/include/Xm/Xm.h:${PKGSRCDIR}/x11/lesstif -.else -RUN_DEPENDS+= ${PREFIX}/include/Xm/Xm.h:${PKGSRCDIR}/x11/lesstif -BUILD_DEPENDS+= ${PREFIX}/include/Xm/Xm.h:${PKGSRCDIR}/x11/lesstif -.endif -.endif - .if defined(USE_LIBTOOL) .if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" LIBTOOL= ${LOCALBASE}/bin/pkglibtool-${OBJECT_FMT}-1.2p2 @@ -565,6 +556,18 @@ INSTALL_TARGET+= install.man FETCH_BEFORE_ARGS += -p .endif +# Check if we got a real Motif, Lesstif or no Motif at all. +.if defined(USE_MOTIF) +.if exists(${X11BASE}/include/Xm/Xm.h) +IS_LESSTIF!= ${EGREP} -c LESSTIF ${X11BASE}/include/Xm/Xm.h || ${TRUE} +.if (${IS_LESSTIF} != "0") +DEPENDS+= lesstif-*:${PKGSRCDIR}/x11/lesstif +.endif +.else +DEPENDS+= lesstif-*:${PKGSRCDIR}/x11/lesstif +.endif +.endif + # Popular master sites MASTER_SITE_XCONTRIB+= \ ftp://crl.dec.com/pub/X11/contrib/ \ |