Fix a logic problem in rev 1.10. Allow datadir to be overridden in all

cases.

Reported by:	Espen Skoglund <esk@ira.uka.de>
This commit is contained in:
Jeremy Lea 2001-09-11 18:56:22 +00:00
parent 1aa485f56a
commit 57209df8b5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=47703

View File

@ -281,10 +281,10 @@ MAKE_ENV+= HAVE_IMLIB=${HAVE_IMLIB}
.if defined(USE_GNOMELIBS) .if defined(USE_GNOMELIBS)
CONFIGURE_ARGS+=--with-gnome=${PREFIX} 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 CONFIGURE_ARGS+=--localstatedir=${PREFIX}/share/gnome
.endif .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 CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gnome
.endif .endif
LIB_DEPENDS+= gnome.5:${PORTSDIR}/x11/gnomelibs LIB_DEPENDS+= gnome.5:${PORTSDIR}/x11/gnomelibs