From 8346d9cb6e28b04550a91aee666ed2e42a5318ff Mon Sep 17 00:00:00 2001
From: sobomax <sobomax@FreeBSD.org>
Date: Wed, 4 Jul 2001 18:29:48 +0000
Subject: 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
---
 Mk/bsd.gnome.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Mk')

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