diff --git a/Mk/mkfile b/Mk/mkfile --- a/Mk/mkfile +++ b/Mk/mkfile @@ -233,14 +233,14 @@ build:QE: patch rfork ne cd $BUILDPATH if(! ~ $BUILDCOMMAND ''){ - $BUILDCOMMAND + eval $BUILDCOMMAND } if not { status='' } if(! ~ $#POSTBUILD 0){ echo 'Running post-build hooks...' - $POSTBUILD + eval $POSTBUILD } } touch build @@ -258,7 +258,7 @@ test:VQE: build rfork ne cd $BUILDPATH if(! ~ $#TESTCOMMAND 0){ - $TESTCOMMAND + eval $TESTCOMMAND if(! ~ $status ''){ echo 'Tests failed. Please notify '^$OWNER status='tests failed' @@ -285,7 +285,7 @@ install:QE: build } } if(! checkport $PORTNAME){ - @{ rfork ne; cd $BUILDPATH && $INSTALLCOMMAND } || exit $status + @{ rfork ne; cd $BUILDPATH && eval $INSTALLCOMMAND } || exit $status if(! ~ $#VERSION 0){ register $PORTNAME $VERSION } @@ -312,7 +312,7 @@ reinstall:VQE: build cd $BUILDPATH @{ rfork ne - $INSTALLCOMMAND + eval $INSTALLCOMMAND } if(! ~ $*MESSAGE 0){ for(i in $MESSAGE){ @@ -325,7 +325,7 @@ testinstall:VQE: cd $BUILDPATH @{ rfork ne - $INSTALLCOMMAND + eval $INSTALLCOMMAND } if(! ~ $*MESSAGE 0){ for(i in $MESSAGE){ @@ -342,7 +342,7 @@ clean:VQE: $BUILDPATH exit } if(! ~ $#CLEANCOMMAND 0){ - $CLEANCOMMAND || exit $status + eval $CLEANCOMMAND || exit $status } } rm -f build @@ -381,7 +381,7 @@ uninstall:VQE: @{ rfork ne cd $BUILDPATH - $UNINSTALLCOMMAND + eval $UNINSTALLCOMMAND } || exit $status } deregister $PORTNAME diff --git a/dev-lang/go-19/mkfile b/dev-lang/go-19/mkfile --- a/dev-lang/go-19/mkfile +++ b/dev-lang/go-19/mkfile @@ -10,7 +10,7 @@ DEPS=app-misc/ca-certificates WEBSOURCE=http://9legacy.org/download/go/go$VERSION-plan9-$objtype-bootstrap.tbz BUILDPATH=work/go-plan9-$objtype-bootstrap BUILDCOMMAND=fortune /lib/rob -INSTALLCOMMAND=/bin/rc -c '''mkdir -p /sys/lib/go/$objtype-$VERSION && dircp . /sys/lib/go/$objtype-$VERSION''' +INSTALLCOMMAND=mkdir -p /sys/lib/go/$objtype-$VERSION && dircp . /sys/lib/go/$objtype-$VERSION CLEANCOMMAND=fortune /lib/ken UNINSTALLCOMMAND=rm -rf /sys/lib/go/$objtype-$VERSION MESSAGE='To use go, add this to your profile:' \