From 52f0fabf1c6f601b02951d4f43501b7b31634053 Mon Sep 17 00:00:00 2001 From: John Marino Date: Wed, 25 Feb 2015 11:36:31 +0000 Subject: multimedia/mkvtoolnix: set environment during build/install and unsuppress This port was strange in that it not only failed to set the environment, it was unsetting PREFIX to whatever environment it had. This change sets the environment in both build and install targets with the exception of PREFIX. I don't know why that is done, but I maintained that part. While here, unsuppress the commands so that the build can be logged and change ";" to "&&" conjunctions which is preferred. Approved by: blanket --- multimedia/mkvtoolnix/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index fb04749c3f2d..09abd4415074 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -59,9 +59,10 @@ INSTALLS_ICONS= yes .endif do-build: - @(cd ${WRKSRC}/; unset PREFIX; ./drake ${_MAKE_JOBS}) + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NPREFIX=*} ./drake ${_MAKE_JOBS}) do-install: - @(cd ${WRKSRC}/; unset PREFIX; ./drake ${_MAKE_JOBS} ${MAKE_ARGS} install) + (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NPREFIX=*} \ + ./drake ${_MAKE_JOBS} ${MAKE_ARGS} install) .include -- cgit