aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorsobomax <sobomax@FreeBSD.org>2001-07-04 01:26:42 +0800
committersobomax <sobomax@FreeBSD.org>2001-07-04 01:26:42 +0800
commitf997e78868f43a330d28d5a212b3354729e11f2e (patch)
treef1ab180715e1c9cf567a62a5eada534d3ba9dac4 /Mk
parent43cfae46919e65bd511334dfc13de14f4bd1a32e (diff)
downloadfreebsd-ports-gnome-f997e78868f43a330d28d5a212b3354729e11f2e.tar.gz
freebsd-ports-gnome-f997e78868f43a330d28d5a212b3354729e11f2e.tar.zst
freebsd-ports-gnome-f997e78868f43a330d28d5a212b3354729e11f2e.zip
Allow fully Gnome ports override default --localstatedir and --datadir
configure args if necessary. Previously only ports that optionally depend on Gnome were allowed to do so.
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 47be7e96350e..9a16571ba3df 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}
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}
CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gnome
.endif
LIB_DEPENDS+= gnome.5:${PORTSDIR}/x11/gnomelibs