diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-07-04 18:29:48 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-07-04 18:29:48 +0000 |
| commit | 68d6899ca1279dd8fa0597599e651a88258e90ba (patch) | |
| tree | 2bd050a460f583f1f0b3f3ed6e0e11a759f4181c /Mk | |
| parent | Update to 1.4.0.2. (diff) | |
Workarround a bug in make(1) that leads results in --datadir/--localstatedir
not being set properly for some ports. The problem is that ":S" modifier
collapses spaces, even if the regex doesn't match. The following piece of
make(1) "code" illustrates the problem:
foo= a b
.if ${foo} != ${foo:S/x//}
all:
@${ECHO} 'BAD!'
.endif
Notes
Notes:
svn path=/head/; revision=44759
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnome.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 9a16571ba3df..6fb079e9377b 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -281,10 +281,10 @@ MAKE_ENV+= HAVE_IMLIB=${HAVE_IMLIB} .if defined(USE_GNOMELIBS) CONFIGURE_ARGS+=--with-gnome=${PREFIX} -.if !defined(HAVE_GNOME) && ${CONFIGURE_ARGS:S/--localstatedir=//} == ${CONFIGURE_ARGS} +.if !defined(HAVE_GNOME) && ${CONFIGURE_ARGS:S/--localstatedir=//} == ${CONFIGURE_ARGS:S/ / /g} CONFIGURE_ARGS+=--localstatedir=${PREFIX}/share/gnome .endif -.if !defined(HAVE_GNOME) && ${CONFIGURE_ARGS:S/--datadir=//} == ${CONFIGURE_ARGS} +.if !defined(HAVE_GNOME) && ${CONFIGURE_ARGS:S/--datadir=//} == ${CONFIGURE_ARGS:S/ / /g} CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gnome .endif LIB_DEPENDS+= gnome.5:${PORTSDIR}/x11/gnomelibs |