diff options
| -rw-r--r-- | mk/defaults/mk.conf | 10 | ||||
| -rw-r--r-- | mk/motif.buildlink3.mk | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 5341a1fb2dc..50d4b3bc8fe 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.216 2012/08/18 16:29:59 chs Exp $ +# $NetBSD: mk.conf,v 1.217 2012/11/10 17:13:37 ryoon Exp $ # # This file provides default values for variables that may be overridden @@ -277,7 +277,7 @@ VARBASE?= /var # Where Motif-2.0-compatible headers and libraries are installed # on the system. # Possible: any path -# Default: ${X11PREFIX} or where openmotif or lesstif is installed +# Default: ${X11PREFIX} or where motif, openmotif or lesstif is installed PKGINFODIR?= info # The subdirectory of PREFIX that holds the GNU info files and the @@ -1291,13 +1291,13 @@ MOZILLA_USE_XFT?= NO # the possible values below is already installed, but defaults to # ${MOTIF_TYPE_DEFAULT}. This value is ignored if MOTIFBASE is # explicitly set. -# Possible: openmotif, lesstif, dt (Irix and Solaris only) +# Possible: motif, openmotif, lesstif, dt (Irix and Solaris only) # Default: ${MOTIF_TYPE_DEFAULT} #MOTIF_TYPE_DEFAULT?= openmotif # Used by motif.buildlink3.mk as the final default value for MOTIF_TYPE. -# Possible: openmotif, lesstif, dt (Irix and Solaris only) -# Default: openmotif, or dt (Irix and Solaris only) +# Possible: motif, openmotif, lesstif, dt (Irix and Solaris only) +# Default: motif, openmotif, or dt (Irix and Solaris only) #MPG123_ARM_FIXED64=YES # Used by mpg123 and mpg123-esound to enable ARM to use 64bit fixedpoint diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk index 144674de1d6..7f747b46aa0 100644 --- a/mk/motif.buildlink3.mk +++ b/mk/motif.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink3.mk,v 1.15 2012/01/12 15:51:14 hans Exp $ +# $NetBSD: motif.buildlink3.mk,v 1.16 2012/11/10 17:13:37 ryoon Exp $ # # Package-settable variables: # @@ -53,6 +53,7 @@ _MOTIF_TYPE= ${MOTIF_TYPE_DEFAULT} .if defined(MOTIF_TYPE) . if (${MOTIF_TYPE} == "dt") || \ (${MOTIF_TYPE} == "lesstif") || \ + (${MOTIF_TYPE} == "motif") || \ (${MOTIF_TYPE} == "openmotif") _MOTIF_TYPE= ${MOTIF_TYPE} . endif @@ -73,7 +74,9 @@ _MOTIFBASE= ${X11BASE} . endif .endif -.if ${_MOTIF_TYPE} == "openmotif" +.if ${_MOTIF_TYPE} == "motif" +. include "../../x11/motif/buildlink3.mk" +.elif ${_MOTIF_TYPE} == "openmotif" . include "../../x11/openmotif/buildlink3.mk" .elif ${_MOTIF_TYPE} == "lesstif" . include "../../x11/lesstif/buildlink3.mk" |