diff options
| author | arved <arved@FreeBSD.org> | 2002-11-22 18:58:35 +0000 |
|---|---|---|
| committer | arved <arved@FreeBSD.org> | 2002-11-22 18:58:35 +0000 |
| commit | eaea16b703b987f43c7cfed4c97c4966d5d421a7 (patch) | |
| tree | 3e3c80275f023331a5a209d1c2274b9279572bdc | |
| parent | 23a5cc0b8a3f3174d75626d53a05e4547a21ad96 (diff) | |
| download | FreeBSD-ports-eaea16b703b987f43c7cfed4c97c4966d5d421a7.zip FreeBSD-ports-eaea16b703b987f43c7cfed4c97c4966d5d421a7.tar.gz | |
Pass QTDIR explict to qmake
Reported by: bento, Michael Collette <metrol@metrol.net>
| -rw-r--r-- | cad/qcad/Makefile | 4 | ||||
| -rw-r--r-- | cad/qcad2/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 093b575..7e65941 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -17,12 +17,14 @@ MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_REINPLACE= yes USE_QT_VER= 3 +QTDIR?= ${X11BASE} .include <bsd.port.pre.mk> .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -O0 .endif +MAKE_ENV+= QTDIR=${QTDIR} post-patch: ${REINPLACE_CMD} -e 's,warn_on,warn_on thread,' ${WRKSRC}/qcad.pro @@ -31,7 +33,7 @@ post-patch: ${WRKSRC}/rfonts.cpp ${WRKSRC}/rlibrarybrowser.cpp pre-build: - cd ${BUILD_WRKSRC}; qmake -spec ${X11BASE}/mkspecs/freebsd-g++ qcad.pro + cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} qmake -spec ${X11BASE}/mkspecs/freebsd-g++ qcad.pro do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qcad ${PREFIX}/bin diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile index 093b575..7e65941 100644 --- a/cad/qcad2/Makefile +++ b/cad/qcad2/Makefile @@ -17,12 +17,14 @@ MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_REINPLACE= yes USE_QT_VER= 3 +QTDIR?= ${X11BASE} .include <bsd.port.pre.mk> .if ${MACHINE_ARCH} == "alpha" CFLAGS+= -O0 .endif +MAKE_ENV+= QTDIR=${QTDIR} post-patch: ${REINPLACE_CMD} -e 's,warn_on,warn_on thread,' ${WRKSRC}/qcad.pro @@ -31,7 +33,7 @@ post-patch: ${WRKSRC}/rfonts.cpp ${WRKSRC}/rlibrarybrowser.cpp pre-build: - cd ${BUILD_WRKSRC}; qmake -spec ${X11BASE}/mkspecs/freebsd-g++ qcad.pro + cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} qmake -spec ${X11BASE}/mkspecs/freebsd-g++ qcad.pro do-install: ${INSTALL_PROGRAM} ${WRKSRC}/qcad ${PREFIX}/bin |
