summaryrefslogtreecommitdiff
path: root/Mk/bsd.gnome.mk
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2001-09-11 18:56:22 +0000
committerJeremy Lea <reg@FreeBSD.org>2001-09-11 18:56:22 +0000
commit57209df8b54b9d3c843ef3a5bc68fcc32fe546f7 (patch)
tree1295f01aea610038902ed94bc811a36125f895b3 /Mk/bsd.gnome.mk
parentunbreak at bento: ${LN} -f mostly does not work if WRKDIRPREFIX is set. (diff)
Fix a logic problem in rev 1.10. Allow datadir to be overridden in all
cases. Reported by: Espen Skoglund <esk@ira.uka.de>
Notes
Notes: svn path=/head/; revision=47703
Diffstat (limited to 'Mk/bsd.gnome.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