aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorreg <reg@FreeBSD.org>2001-09-12 02:56:22 +0800
committerreg <reg@FreeBSD.org>2001-09-12 02:56:22 +0800
commiteeddebc5bc62a0e8c2ec10273b540033a1c3b1d4 (patch)
tree146558ca536139cc9f84fa321e7036c64f4ad98d /Mk
parentf3170fef6559b4ee7adea405c407bf16a4f6bb99 (diff)
downloadfreebsd-ports-gnome-eeddebc5bc62a0e8c2ec10273b540033a1c3b1d4.tar.gz
freebsd-ports-gnome-eeddebc5bc62a0e8c2ec10273b540033a1c3b1d4.tar.zst
freebsd-ports-gnome-eeddebc5bc62a0e8c2ec10273b540033a1c3b1d4.zip
Fix a logic problem in rev 1.10. Allow datadir to be overridden in all
cases. Reported by: Espen Skoglund <esk@ira.uka.de>
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gnome.mk4
1 files 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