diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2004-02-05 01:23:10 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2004-02-05 01:23:10 +0000 |
| commit | 38a92d46fecb74d6b431e72fb051d4852ae09192 (patch) | |
| tree | 9175166a8d864537bf06b6192f8990ba59164986 /Mk | |
| parent | baa573cc0f3c67d02f961def5da5d4b3fccc5e54 (diff) | |
| download | ports-38a92d46fecb74d6b431e72fb051d4852ae09192.tar.gz ports-38a92d46fecb74d6b431e72fb051d4852ae09192.zip | |
Notes
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.kde.mk | 11 | ||||
| -rw-r--r-- | Mk/bsd.kde4.mk | 11 |
2 files changed, 12 insertions, 10 deletions
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index f5c3d7570f49..3119c7c2a279 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -105,7 +105,7 @@ QTCPPFLAGS+= -D_GETOPT_H # added to work around broken getopt.h #inc .if !defined (QT_NONSTANDARD) CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \ --with-extra-includes="${LOCALBASE}/include" -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}" .endif @@ -113,7 +113,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.1.4 +KDE_VERSION= 3.2.0 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -133,8 +133,9 @@ QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ .if !defined(QT_NONSTANDARD) CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" + --with-extra-libs=${LOCALBASE}/lib \ + --with-extra-includes=${LOCALBASE}/include +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif # !defined(QT_NONSTANDARD) .else # QT2 @@ -154,7 +155,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ - CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" + CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif # !defined(QT_NONSTANDARD) .endif # USE_QT_VER == ??? diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index f5c3d7570f49..3119c7c2a279 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -105,7 +105,7 @@ QTCPPFLAGS+= -D_GETOPT_H # added to work around broken getopt.h #inc .if !defined (QT_NONSTANDARD) CONFIGURE_ARGS+=--with-extra-libs="${LOCALBASE}/lib" \ --with-extra-includes="${LOCALBASE}/include" -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ QTDIR="${QT_CVS_PREFIX}" KDEDIR="${KDE_CVS_PREFIX}" .endif @@ -113,7 +113,7 @@ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \ # Yeah, it's namespace pollution, but this is really the best place for this # stuff. Arts does NOT use it anymore. -KDE_VERSION= 3.1.4 +KDE_VERSION= 3.2.0 KDE_ORIGVER= ${KDE_VERSION} KDE_PREFIX?= ${LOCALBASE} @@ -133,8 +133,9 @@ QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \ .if !defined(QT_NONSTANDARD) CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ --with-qt-libraries=${QT_PREFIX}/lib \ - --with-extra-libs=${LOCALBASE}/lib -CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" + --with-extra-libs=${LOCALBASE}/lib \ + --with-extra-includes=${LOCALBASE}/include +CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif # !defined(QT_NONSTANDARD) .else # QT2 @@ -154,7 +155,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${X11BASE}/include/qt2 \ --with-qt-libraries=${X11BASE}/lib \ --with-extra-libs=${LOCALBASE}/lib CONFIGURE_ENV+= MOC="${MOC}" LIBQT="-l${QTNAME}" \ - CPPFLAGS="${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" + CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif # !defined(QT_NONSTANDARD) .endif # USE_QT_VER == ??? |