From 57209df8b54b9d3c843ef3a5bc68fcc32fe546f7 Mon Sep 17 00:00:00 2001
From: Jeremy Lea <reg@FreeBSD.org>
Date: Tue, 11 Sep 2001 18:56:22 +0000
Subject: [PATCH] Fix a logic problem in rev 1.10.  Allow datadir to be
 overridden in all cases.

Reported by:	Espen Skoglund <esk@ira.uka.de>
---
 Mk/bsd.gnome.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index 6fb079e9377b..bdd4762714fd 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:S/  / /g}
+.if ${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:S/  / /g}
+.if ${CONFIGURE_ARGS:S/--datadir=//} == ${CONFIGURE_ARGS:S/  / /g}
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gnome
 .endif
 LIB_DEPENDS+=	gnome.5:${PORTSDIR}/x11/gnomelibs