aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2001-11-13 06:35:28 +0000
committerWill Andrews <will@FreeBSD.org>2001-11-13 06:35:28 +0000
commit7668e8de7f9bb34b29093a072e0725a57e2ba239 (patch)
treeb3d683c75e36c3aa3ab565372b0f8bb9aef6a948
parent0dcbd3fdc4ad6e0c6b0caec883a29c00626889d8 (diff)
downloadports-7668e8de7f9bb34b29093a072e0725a57e2ba239.tar.gz
ports-7668e8de7f9bb34b29093a072e0725a57e2ba239.zip
Notes
-rw-r--r--Mk/bsd.kde.mk9
-rw-r--r--Mk/bsd.kde4.mk9
2 files changed, 10 insertions, 8 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index e46a25cb3396..013d75af4129 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -109,15 +109,16 @@ QTCPPFLAGS?=
QTCGFLIBS?=
# Qt 3.x common stuff
-MOC?= ${X11BASE}/bin/moc
+QT_PREFIX?= ${X11BASE}/qt
+MOC?= ${QT_PREFIX}/bin/moc
LIB_DEPENDS+= qt:${PORTSDIR}/x11-toolkits/qt-copy
USE_NEWGCC= yes
QTCPPFLAGS+= -I/usr/include -I${LOCALBASE}/include -I${PREFIX}/include \
- -I${X11BASE}/include/qt
+ -I${QT_PREFIX}/include/qt
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
- -lqt
+ -L${QT_PREFIX}/lib
.if !defined(QT_NONSTANDARD)
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt \
+CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
--with-qt-libraries=${X11BASE}/lib \
--with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index e46a25cb3396..013d75af4129 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -109,15 +109,16 @@ QTCPPFLAGS?=
QTCGFLIBS?=
# Qt 3.x common stuff
-MOC?= ${X11BASE}/bin/moc
+QT_PREFIX?= ${X11BASE}/qt
+MOC?= ${QT_PREFIX}/bin/moc
LIB_DEPENDS+= qt:${PORTSDIR}/x11-toolkits/qt-copy
USE_NEWGCC= yes
QTCPPFLAGS+= -I/usr/include -I${LOCALBASE}/include -I${PREFIX}/include \
- -I${X11BASE}/include/qt
+ -I${QT_PREFIX}/include/qt
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
- -lqt
+ -L${QT_PREFIX}/lib
.if !defined(QT_NONSTANDARD)
-CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt \
+CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
--with-qt-libraries=${X11BASE}/lib \
--with-extra-libs=${LOCALBASE}/lib
CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}"