diff options
| author | miwi <miwi@FreeBSD.org> | 2012-02-07 15:24:15 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2012-02-07 15:24:15 +0800 |
| commit | b80a4474df3810b16551be5d117f56d77b66c7a1 (patch) | |
| tree | f2e5a69aaebad6f104e77f94be108ca79bea3d75 | |
| parent | 0cd25a7f18db22359747c4a6c0546f9fba8a95e4 (diff) | |
| download | freebsd-ports-gnome-b80a4474df3810b16551be5d117f56d77b66c7a1.tar.gz freebsd-ports-gnome-b80a4474df3810b16551be5d117f56d77b66c7a1.tar.zst freebsd-ports-gnome-b80a4474df3810b16551be5d117f56d77b66c7a1.zip | |
- Respect LOCALBASE
| -rw-r--r-- | devel/talloc/Makefile | 10 | ||||
| -rw-r--r-- | graphics/exif/Makefile | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/devel/talloc/Makefile b/devel/talloc/Makefile index 3f54d8c38910..35cd4718d349 100644 --- a/devel/talloc/Makefile +++ b/devel/talloc/Makefile @@ -30,8 +30,8 @@ USE_GNOME= pkgconfig MAKE_JOBS_SAFE= yes -PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig -PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} +PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig +PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${LOCALBASE}/;;} OPTIONS= PYTHON "Python bindings" on @@ -48,7 +48,7 @@ CONFIGURE_ENV+= XSLTPROC="/usr/bin/true" CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes X11BASE=${LOCALBASE} -CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man +CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man --prefix=${LOCALBASE} .if !defined(DISABLE_MAKE_JOBS) CONFIGURE_ARGS+= --jobs=${MAKE_JOBS_NUMBER} @@ -83,7 +83,7 @@ pre-build: do-build: @(cd ${BUILD_WRKSRC}; \ - if ! ${SETENV} ${MAKE_ENV} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} build; then \ + if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} build; then \ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ @@ -92,6 +92,6 @@ do-build: fi) do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install) + @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install) .include <bsd.port.mk> diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile index 042e4cc5e55f..dc7bd37f6925 100644 --- a/graphics/exif/Makefile +++ b/graphics/exif/Makefile @@ -19,10 +19,10 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_JOBS_SAFE= yes +CONFIGURE_ENV+= POPT_CFLAGS=-I${LOCALBASE}/include POPT_LIBS="-L${LOCALBASE}/lib -lpopt" .if defined(WITHOUT_NLS) CONFIGURE_ARGS+= --disable-nls --without-libiconv-prefix -CONFIGURE_ENV+= POPT_CFLAGS=-I${PREFIX}/include POPT_LIBS="-L${PREFIX}/lib -lpopt" PLIST_SUB+= NLS="@comment " .else USE_ICONV= yes |