1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

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
This commit is contained in:
Maxim Sobolev 2001-07-04 18:29:48 +00:00
parent 957aa9d237
commit 68d6899ca1
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=44759

View File

@ -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