diff options
| author | jlam <jlam@pkgsrc.org> | 2001-09-13 08:37:28 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-09-13 08:37:28 +0000 |
| commit | 4e15ec09d813a81759f083e0b29d5787bf7e44af (patch) | |
| tree | 8b52d5962523e14510b788ad79e78b38f33dd26c /mk | |
| parent | 74f0448f6c276faf35ba26b8366d421f12269198 (diff) | |
| download | pkgsrc-4e15ec09d813a81759f083e0b29d5787bf7e44af.tar.gz | |
Set MOTIFBASE within the scope of the Motif-compatible package's
buildlink.mk as it uses values from the buildlink.mk for it's own value.
Also don't pass MOTIFBASE to the MAKE_ENV as it causes the correct package
buildlink.mk file to not be included.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/motif.buildlink.mk | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mk/motif.buildlink.mk b/mk/motif.buildlink.mk index a5039a7b6b7..e93eef6f6d6 100644 --- a/mk/motif.buildlink.mk +++ b/mk/motif.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink.mk,v 1.2 2001/09/13 08:05:10 jlam Exp $ +# $NetBSD: motif.buildlink.mk,v 1.3 2001/09/13 08:37:28 jlam Exp $ # # This Makefile fragment is included by packages that use Motif. # @@ -65,17 +65,15 @@ _MOTIF_TYPE= none MOTIFBASE= /usr/dt . elif ${_MOTIF_TYPE} == "none" MOTIFBASE= ${X11BASE} -. elif ${_MOTIF_TYPE} == "openmotif" -MOTIFBASE= ${X11PREFIX} -. elif ${_MOTIF_TYPE} == "lesstif" -MOTIFBASE= ${X11PREFIX} . endif .endif .if ${_MOTIF_TYPE} == "openmotif" . include "../../x11/openmotif/buildlink.mk" +MOTIFBASE= ${BUILDLINK_PREFIX.openmotif} .elif ${_MOTIF_TYPE} == "lesstif" . include "../../x11/lesstif/buildlink.mk" +MOTIFBASE= ${BUILDLINK_PREFIX.lesstif} .else # # Link the pre-existing Motif libraries and headers in ${MOTIFBASE} into @@ -98,7 +96,6 @@ motif-buildlink: _BUILDLINK_USE .endif USE_X11= # defined -MAKE_ENV+= MOTIFBASE="${MOTIFBASE}" MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" LDFLAGS+= -Wl,-R${MOTIFBASE}/lib MOTIFLIB?= -Wl,-R${MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -lXm -lXp |