diff options
| author | jlam <jlam> | 2002-10-02 07:27:23 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-10-02 07:27:23 +0000 |
| commit | 347587eeb22f5f17d906918bcffe53bff1a81457 (patch) | |
| tree | 4748b44d2df73bbd7d2e1e160198611ff47a7a1f /x11/qt3-libs | |
| parent | 9ecd4f6bc0c9d7bb8776f3d060cd130da0b1999a (diff) | |
| download | pkgsrc-347587eeb22f5f17d906918bcffe53bff1a81457.tar.gz | |
Bracket passing QTDIR to the make and configure environments so that they
aren't used when building Qt3 itself, as Qt3 expects QTDIR=${WRKSRC},
which is handled by qt3-libs/Makefile.common.
Diffstat (limited to 'x11/qt3-libs')
| -rw-r--r-- | x11/qt3-libs/buildlink2.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk index bab910b234b..b964f0acfaf 100644 --- a/x11/qt3-libs/buildlink2.mk +++ b/x11/qt3-libs/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.5 2002/10/01 19:30:47 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2002/10/02 07:27:23 jlam Exp $ .if !defined(QT3_LIBS_BUILDLINK2_MK) QT3_LIBS_BUILDLINK2_MK= # defined @@ -27,12 +27,15 @@ PTHREAD_OPTS+= require .include "../../graphics/png/buildlink2.mk" .include "../../mk/pthread.buildlink2.mk" -CONFIGURE_ENV+= QTDIR="${QTDIR}" CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" -MAKE_ENV+= QTDIR="${QTDIR}" MAKE_ENV+= MOC="${QTDIR}/bin/moc" LDFLAGS+= -Wl,-R${QTDIR}/lib +.if !defined(BUILD_QT3) +CONFIGURE_ENV+= QTDIR="${QTDIR}" +MAKE_ENV+= QTDIR="${QTDIR}" +.endif + BUILDLINK_TARGETS+= qt3-libs-buildlink qt3-libs-buildlink: _BUILDLINK_USE |