diff options
author | jlam <jlam> | 2002-04-23 02:14:20 +0000 |
---|---|---|
committer | jlam <jlam> | 2002-04-23 02:14:20 +0000 |
commit | 68689fc676227c8256609393403d34a02207a4d7 (patch) | |
tree | 12f6eb26c3ad15012a3441836c47f9197fdd9165 /mk | |
parent | 2f9129b891a2641f38285a5013ca0ff3846dac56 (diff) | |
download | pkgsrc-68689fc676227c8256609393403d34a02207a4d7.tar.gz |
Defined USE_X11 instead of USE_X11BASE. We don't necessarily want to
force a package to be installed into ${X11BASE} if it uses Motif. As a
side effect, the xemacs and xemacs-current packages no longer install into
${X11BASE} but into ${LOCALBASE}, which matches what they used to do before
being converted to use Motif dialogs.
Diffstat (limited to 'mk')
-rw-r--r-- | mk/motif.buildlink.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/motif.buildlink.mk b/mk/motif.buildlink.mk index bbd38d013f3..891b2ec0d42 100644 --- a/mk/motif.buildlink.mk +++ b/mk/motif.buildlink.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink.mk,v 1.11 2001/11/21 13:54:14 agc Exp $ +# $NetBSD: motif.buildlink.mk,v 1.12 2002/04/23 02:14:20 jlam Exp $ # # This Makefile fragment is included by packages that use Motif. # @@ -151,7 +151,7 @@ MOTIFBASE= ${_MOTIFBASE} . endif .endif -USE_X11BASE= # defined +USE_X11= # defined MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" LDFLAGS+= -Wl,-R${_MOTIFBASE}/lib MOTIFLIB?= -Wl,-R${_MOTIFBASE}/lib -Wl,-R${X11BASE}/lib -L${BUILDLINK_DIR}/lib -lXm -lXp |