Pass full setup through to configure and build

This commit is contained in:
espie 2001-08-27 09:54:11 +00:00
parent 5cd875b42f
commit b5ae8331d0
2 changed files with 18 additions and 12 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: qt.port.mk,v 1.1 2001/08/27 09:08:57 espie Exp $
# $OpenBSD: qt.port.mk,v 1.2 2001/08/27 09:54:11 espie Exp $
# This fragment uses MODQT_* variables to make it easier to substitute
# qt1/qt2/qt3 in a port.
@ -7,9 +7,12 @@ LIB_DEPENDS+=qt.1::x11/qt
MODQT_LIBDIR= ${LOCALBASE}/lib/qt
MODQT_INCDIR= ${LOCALBASE}/include/X11/qt
MODQT_MOC= ${LOCALBASE}/bin/moc
MODQT_CONFIGURE_ARGS=--with-qt-includes=${MODQT_INCDIR}
MODQT_CONFIGURE_ARGS+=--with-qt-libraries=${MODQT_LIBDIR}
MODQT_CONFIGURE_ARGS= --with-qt-includes=${MODQT_INCDIR} \
--with-qt-libraries=${MODQT_LIBDIR}
_MODQT_SETUP= MOC=${MODQT_MOC} \
MODQT_INCDIR=${MODQT_INCDIR} \
MODQT_LIBDIR=${MODQT_LIBDIR}
CONFIGURE_ENV+= MOC=${MODQT_MOC}
MAKE_ENV+= MOC=${MODQT_MOC}
MAKE_FLAGS+= MOC=${MODQT_MOC}
CONFIGURE_ENV+= ${_MODQT_SETUP}
MAKE_ENV+= ${_MODQT_SETUP}
MAKE_FLAGS+= ${_MODQT_SETUP}

View File

@ -1,4 +1,4 @@
# $OpenBSD: qt2.port.mk,v 1.1 2001/08/27 08:53:53 espie Exp $
# $OpenBSD: qt2.port.mk,v 1.2 2001/08/27 09:54:11 espie Exp $
# This fragment uses MODQT_* variables to make it easier to substitute
# qt1/qt2/qt3 in a port.
@ -7,9 +7,12 @@ LIB_DEPENDS+=qt.2::x11/qt2
MODQT_LIBDIR= ${LOCALBASE}/lib/qt2
MODQT_INCDIR= ${LOCALBASE}/include/X11/qt2
MODQT_MOC= ${LOCALBASE}/bin/moc2
MODQT_CONFIGURE_ARGS=--with-qt-includes=${MODQT_INCDIR}
MODQT_CONFIGURE_ARGS+=--with-qt-libraries=${MODQT_LIBDIR}
MODQT_CONFIGURE_ARGS= --with-qt-includes=${MODQT_INCDIR} \
--with-qt-libraries=${MODQT_LIBDIR}
_MODQT_SETUP= MOC=${MODQT_MOC} \
MODQT_INCDIR=${MODQT_INCDIR} \
MODQT_LIBDIR=${MODQT_LIBDIR}
CONFIGURE_ENV+= MOC=${MODQT_MOC}
MAKE_ENV+= MOC=${MODQT_MOC}
MAKE_FLAGS+= MOC=${MODQT_MOC}
CONFIGURE_ENV+= ${_MODQT_SETUP}
MAKE_ENV+= ${_MODQT_SETUP}
MAKE_FLAGS+= ${_MODQT_SETUP}