diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2006-07-23 20:16:55 +0800 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2006-07-23 20:16:55 +0800 |
| commit | c1843e8cb0db113dab82d3cd921af831346ac08b (patch) | |
| tree | 28b82f36ec9ea569ab3666782a4888e3c2a89198 | |
| parent | ee102309e8c147efe9b37bb2afe03717f462937a (diff) | |
| download | freebsd-ports-gnome-c1843e8cb0db113dab82d3cd921af831346ac08b.tar.gz freebsd-ports-gnome-c1843e8cb0db113dab82d3cd921af831346ac08b.tar.zst freebsd-ports-gnome-c1843e8cb0db113dab82d3cd921af831346ac08b.zip | |
Fix build error of uim-qt on 6-stable.
Reported by: Dan Reinholz <xaenn@yahoo.com>
| -rw-r--r-- | textproc/uim-qt/Makefile | 6 | ||||
| -rw-r--r-- | textproc/uim/Makefile | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/textproc/uim-qt/Makefile b/textproc/uim-qt/Makefile index 6e3ead0ac76b..3ff0fc4ae9e0 100644 --- a/textproc/uim-qt/Makefile +++ b/textproc/uim-qt/Makefile @@ -16,8 +16,10 @@ MASTERDIR= ${.CURDIR}/../../textproc/uim PKGDIR= ${.CURDIR} CONFIGURE_ARGS= --with-qt CONFIGURE_ENV= QTDIR=${X11BASE}/lib QTINCDIR=${X11BASE}/include \ - CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include" LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib" - + CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ + CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \ + LIBS="${LIBS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib" \ + LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS} -L${X11BASE}/lib -L${LOCALBASE}/lib" UIM_SLAVE= yes # This is normally handled by defining USE_QT_VER ... diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile index eccbb76e74d8..bec1cdccb2f8 100644 --- a/textproc/uim/Makefile +++ b/textproc/uim/Makefile @@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --with-gtk2 CONFIGURE_ARGS+= --enable-emacs .endif -CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ +CONFIGURE_ENV?= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" .if !defined(UIM_SLAVE) |