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

(-)Mk/bsd.qt.mk (-10 / +10 lines)
Lines 208-223 Link Here
208
				FULLVER=${_QT_VERSION:C/-.*//}
208
				FULLVER=${_QT_VERSION:C/-.*//}
209
.endif # defined(QT_DIST)
209
.endif # defined(QT_DIST)
210
210
211
.if !defined(QT_NONSTANDARD)
212
CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
213
				MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
214
				QMAKESPEC="${QMAKESPEC}"
215
CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
216
				--with-qt-libraries=${QT_LIBDIR} \
217
				--with-extra-includes=${LOCALBASE}/include \
218
				--with-extra-libs=${LOCALBASE}/lib
219
.endif # !defined(QT_NONSTANDARD)
220
221
.if ${_QT_VERSION:M4*}
211
.if ${_QT_VERSION:M4*}
222
QT_BINDIR_REL?=	bin
212
QT_BINDIR_REL?=	bin
223
QT_LIBDIR_REL?=	lib/${_QT_RELNAME}
213
QT_LIBDIR_REL?=	lib/${_QT_RELNAME}
Lines 287-292 Link Here
287
277
288
Qt_Post_Include=	bsd.qt.mk
278
Qt_Post_Include=	bsd.qt.mk
289
279
280
.if !defined(QT_NONSTANDARD)
281
CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
282
				MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
283
				QMAKESPEC="${QMAKESPEC}"
284
CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
285
				--with-qt-libraries=${QT_LIBDIR} \
286
				--with-extra-includes=${LOCALBASE}/include \
287
				--with-extra-libs=${LOCALBASE}/lib
288
.endif # !defined(QT_NONSTANDARD)
289
290
_USE_QT_ALL=	assistant clucene dbus declarative designer gui help \
290
_USE_QT_ALL=	assistant clucene dbus declarative designer gui help \
291
				imageformats linguist linguisttools multimedia network opengl pixeltool \
291
				imageformats linguist linguisttools multimedia network opengl pixeltool \
292
				qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \
292
				qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \

Return to bug 204975