Coerce linking into listing qt2 first to avoid qt1 collisions.

This commit is contained in:
espie 2001-01-18 02:30:47 +00:00
parent 0b0b736b0f
commit e89242b18e
2 changed files with 8 additions and 2 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2000/12/17 11:27:58 espie Exp $
# $OpenBSD: Makefile,v 1.9 2001/01/18 02:30:47 espie Exp $
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.305
@ -30,6 +30,9 @@ USE_GMAKE= Yes
CONFIGURE_ENV= MOC=${LOCALBASE}/bin/moc2 \
RUN_KAPPFINDER=no KDEDIR=/usr/local
# Ensure qt2 will always be at the front
MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2'
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2000/12/17 11:27:55 espie Exp $
# $OpenBSD: Makefile,v 1.8 2001/01/18 02:30:48 espie Exp $
CATEGORIES= x11 x11/kde
NEED_VERSION= 1.305
@ -33,6 +33,9 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
USE_GMAKE= Yes
CONFIGURE_ENV= MOC=${LOCALBASE}/bin/moc2
# Ensure qt2 will always be at the front
MAKE_FLAGS=CXXLD='--tag CXX ${CXX} -L${LOCALBASE}/lib/qt2'
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes