Wed Sep 10 16:01:52 2008 UTC ()
Add MOTIF_TYPE and MOTIF_BASE to BUILD_DEFS.


(joerg)
diff -r1.11 -r1.12 pkgsrc/mk/motif.buildlink3.mk

cvs diff -r1.11 -r1.12 pkgsrc/mk/motif.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/motif.buildlink3.mk 2006/11/06 11:29:38 1.11
+++ pkgsrc/mk/motif.buildlink3.mk 2008/09/10 16:01:52 1.12
@@ -1,36 +1,38 @@ @@ -1,36 +1,38 @@
1# $NetBSD: motif.buildlink3.mk,v 1.11 2006/11/06 11:29:38 joerg Exp $ 1# $NetBSD: motif.buildlink3.mk,v 1.12 2008/09/10 16:01:52 joerg Exp $
2# 2#
3# Package-settable variables: 3# Package-settable variables:
4# 4#
5# MOTIFBASE 5# MOTIFBASE
6# choose the Motif-2.0 installation at the named location. 6# choose the Motif-2.0 installation at the named location.
7# 7#
8# MOTIF_TYPE 8# MOTIF_TYPE
9# choose a specific Motif-2.0 package. 9# choose a specific Motif-2.0 package.
10# 10#
11# Result variables: 11# Result variables:
12# 12#
13# MOTIFBASE 13# MOTIFBASE
14# The chosen Motif installation. 14# The chosen Motif installation.
15# 15#
16# MOTIF_TYPE 16# MOTIF_TYPE
17# The chosen Motif package. 17# The chosen Motif package.
18 18
19.if !defined(MOTIF_BUILDLINK3_MK) 19.if !defined(MOTIF_BUILDLINK3_MK)
20MOTIF_BUILDLINK3_MK= # defined 20MOTIF_BUILDLINK3_MK= # defined
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
23 23
 24BUILD_DEFS+= MOTIF_TYPE MOTIF_BASE
 25
24# 26#
25# If /usr/dt is a valid Motif-2.0 installation, then use it. Otherwise, 27# If /usr/dt is a valid Motif-2.0 installation, then use it. Otherwise,
26# check to see if a pkgsrc Motif-2.0 is installed and valid, then use it. 28# check to see if a pkgsrc Motif-2.0 is installed and valid, then use it.
27# Otherwise, if ${X11BASE} is valid, then use it. Otherwise, use the 29# Otherwise, if ${X11BASE} is valid, then use it. Otherwise, use the
28# Motif-2.0 specified by ${MOTIF_TYPE_DEFAULT}. 30# Motif-2.0 specified by ${MOTIF_TYPE_DEFAULT}.
29# 31#
30.if exists(/usr/dt/include/Xm/Xm.h) && \ 32.if exists(/usr/dt/include/Xm/Xm.h) && \
31 exists(/usr/dt/include/Xm/Gadget.h) 33 exists(/usr/dt/include/Xm/Gadget.h)
32_MOTIF_TYPE= dt 34_MOTIF_TYPE= dt
33.elif exists(${X11BASE}/lib/X11/config/OpenMotif.tmpl) || \ 35.elif exists(${X11BASE}/lib/X11/config/OpenMotif.tmpl) || \
34 exists(${LOCALBASE}/lib/X11/config/OpenMotif.tmpl) 36 exists(${LOCALBASE}/lib/X11/config/OpenMotif.tmpl)
35_MOTIF_TYPE= openmotif 37_MOTIF_TYPE= openmotif
36.elif exists(${X11BASE}/lib/X11/config/LessTif.tmpl) || \ 38.elif exists(${X11BASE}/lib/X11/config/LessTif.tmpl) || \