diff options
| author | jlam <jlam> | 2000-07-31 02:49:47 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2000-07-31 02:49:47 +0000 |
| commit | 88bd972c9e2c0d4722a24dfccd08c49e2edad956 (patch) | |
| tree | 2a5786ece45df5709bedbc4fe846156a8d3aec09 /mk | |
| parent | fefff2029d173fa109eefc8d0d4a50afc9af0172 (diff) | |
| download | pkgsrc-88bd972c9e2c0d4722a24dfccd08c49e2edad956.tar.gz | |
Motif-checking code broke when X11PREFIX == X11BASE and both lesstif and
lesstif12 were installed, and set MOTIFBASE to the wrong value when
USE_MOTIF12 was set. Fix this by checking for 1.2/2.0 headers when
setting MOTIFBASE.
Also, use just X11PREFIX instead of extra checks for
X11PREFIX == LOCALBASE throughout bsd.pkg.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 42d3f4f487d..c4ef210fafd 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.525 2000/07/30 14:26:11 tron Exp $ +# $NetBSD: bsd.pkg.mk,v 1.526 2000/07/31 02:49:47 jlam Exp $ # # This file is in the public domain. # @@ -99,28 +99,20 @@ USE_MOTIF= # defined .if ${OPSYS} == "SunOS" MOTIFBASE?= /usr/dt .elif exists(${X11BASE}/include/Xm/Xm.h) -MOTIFBASE?= ${X11BASE} -.elif ${X11PREFIX} == ${LOCALBASE} -.if defined(USE_MOTIF12) -MOTIFBASE?= ${LOCALBASE}/LessTif/Motif1.2 -.else -MOTIFBASE?= ${LOCALBASE} -.endif -.else -.if defined(USE_MOTIF12) -MOTIFBASE?= ${X11BASE}/LessTif/Motif1.2 +.if defined(USE_MOTIF12) && exists(${X11BASE}/include/Xm/Gadget.h) +MOTIFBASE?= ${X11PREFIX}/LessTif/Motif1.2 .else MOTIFBASE?= ${X11BASE} .endif +.elif defined(USE_MOTIF12) +MOTIFBASE?= ${X11PREFIX}/LessTif/Motif1.2 +.else +MOTIFBASE?= ${X11PREFIX} .endif .endif # USE_MOTIF .if defined(USE_IMAKE) || defined(USE_MOTIF) || defined(USE_X11BASE) -.if ${X11PREFIX} == ${LOCALBASE} -PREFIX= ${LOCALBASE} -.else -PREFIX= ${X11BASE} -.endif +PREFIX= ${X11PREFIX} .elif defined(USE_CROSSBASE) PREFIX= ${CROSSBASE} NO_MTREE= yes |