diff options
| author | R. Imura <imura@FreeBSD.org> | 2000-10-23 16:09:07 +0000 |
|---|---|---|
| committer | R. Imura <imura@FreeBSD.org> | 2000-10-23 16:09:07 +0000 |
| commit | 9fbd04e5bf4c4fafb72c0e31d6f175f612c9a497 (patch) | |
| tree | aa925fdff2f73da8688898e9ddcdea576e07ab8d /x11 | |
| parent | Remove ruby-[qt/kde]-i18n, because kde-i18n is no longer exist. (diff) | |
Make it PREFIX-safe.
Submitted by: will
Notes
Notes:
svn path=/head/; revision=34142
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/kdebase11/Makefile | 14 | ||||
| -rw-r--r-- | x11/kdelibs11/Makefile | 12 |
2 files changed, 22 insertions, 4 deletions
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile index 9720f2fd4906..5ca75955bf44 100644 --- a/x11/kdebase11/Makefile +++ b/x11/kdebase11/Makefile @@ -28,13 +28,23 @@ USE_BZIP2= yes USE_QT= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-xdmdir=${X11BASE}/lib/X11/xdm +CONFIGURE_ARGS= --with-qt-includes=${QTDIR}/include/X11/qt \ + --with-extra-includes=${LOCALBASE}/include \ + --with-extra-libs=${LOCALBASE}/lib \ + --with-xdmdir=${X11BASE}/lib/X11/xdm CONFIGURE_ENV= CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \ INSTALL_SCRIPT="install -c -m 555" PATH="${PATH}:${X11BASE}/bin" \ - RUN_KAPPFINDER="no" + RUN_KAPPFINDER="no" \ + QTDIR=${QTDIR} MAKE_ENV= RM=${RM} CFLAGS+= "-I$(PREFIX)/include" +.if defined(PREFIX) +QTDIR?= ${PREFIX} +.else +QTDIR?= ${X11BASE} +.endif + pre-patch: @${CP} ${FILESDIR}/ja.kimap ${WRKSRC}/kikbd/maps diff --git a/x11/kdelibs11/Makefile b/x11/kdelibs11/Makefile index 670f93df94ae..51b02e013e5a 100644 --- a/x11/kdelibs11/Makefile +++ b/x11/kdelibs11/Makefile @@ -34,9 +34,17 @@ INSTALLS_SHLIB= yes USE_LIBTOOL= yes LIBTOOLFLAGS= CONFIGURE_ARGS= --enable-shared --x-includes="$(X11BASE)/include" \ - --x-libraries="$(X11BASE)/lib" --disable-static + --x-libraries="$(X11BASE)/lib" --disable-static \ + --with-qt-includes=${QTDIR}/include/X11/qt CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + QTDIR=${QTDIR} + +.if defined(PREFIX) +QTDIR?= ${PREFIX} +.else +QTDIR?= ${X11BASE} +.endif # generate KDE style mtree MTREE_CMD= ${CAT} ${MTREE_FILE} ${FILESDIR}/kde.dist | /usr/sbin/mtree |