View | Details | Raw Unified | Return to bug 56290
Collapse All | Expand All

(-)Makefile (-2 / +4 lines)
Lines 25-31 Link Here
25
DOCUMENT_ROOT=${DATADIR}/data
25
DOCUMENT_ROOT=${DATADIR}/data
26
DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
26
DEFAULT_PATH=/bin:/usr/bin:${PREFIX}/bin
27
27
28
.if defined(WITHOUT_APACHE_EXPAT) && ${WITHOUT_APACHE_EXPAT} == yes
28
.if defined(WITH_APACHE_EXPAT) && ${WITH_APACHE_EXPAT} == yes
29
EXPAT_CONF+=    --enable-rule=EXPAT
30
.elif defined(WITH_APACHE_EXPAT)
29
EXPAT_CONF+=    --disable-rule=EXPAT
31
EXPAT_CONF+=    --disable-rule=EXPAT
30
.else
32
.else
31
LIB_DEPENDS+=   expat.4:${PORTSDIR}/textproc/expat2
33
LIB_DEPENDS+=   expat.4:${PORTSDIR}/textproc/expat2
Lines 107-113 Link Here
107
109
108
CONFIGURE_ENV=  OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
110
CONFIGURE_ENV=  OPTIM='${OPTIM}' LD_SHLIB='${CC}' LIBS='${LIBS}'
109
111
110
.if !defined(WITHOUT_APACHE_EXPAT) || ${WITHOUT_APACHE_EXPAT} != yes
112
.if !defined(WITH_APACHE_EXPAT)
111
CONFIGURE_ENV+= \
113
CONFIGURE_ENV+= \
112
		INCLUDES=-I${LOCALBASE}/include \
114
		INCLUDES=-I${LOCALBASE}/include \
113
		LDFLAGS=-L${LOCALBASE}/lib
115
		LDFLAGS=-L${LOCALBASE}/lib

Return to bug 56290