From 3fa03dfd6eed93c65ad0eaa70296742fa0b279bd Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Thu, 16 Jan 2014 16:43:24 +0000 Subject: [PATCH] - Remove trailing space added in r339920, please don't do that :( - Move OPTIONS block down within Makefile where it is usually placed, sort PLIST-related knobs - Convert clumsy "cd foo && ..." to our standard, $cwd-agnostic, shorter, and more readable constructs (and avoid needless line-wrapping) --- benchmarks/mdtest/Makefile | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/benchmarks/mdtest/Makefile b/benchmarks/mdtest/Makefile index c007de60631a..fc4ef2c8ecff 100644 --- a/benchmarks/mdtest/Makefile +++ b/benchmarks/mdtest/Makefile @@ -1,6 +1,6 @@ # Created by: Chao Shin # $FreeBSD$ - + PORTNAME= mdtest PORTVERSION= 1.9.3 CATEGORIES= benchmarks @@ -12,15 +12,15 @@ COMMENT= Filesystem metadata benchmark utility LICENSE= GPLv2 -OPTIONS_DEFINE= OPENMPI EXAMPLES -OPENMPI_DESC= Use Open MPI instead of MPICH2 - NO_WRKSUBDIR= yes CFLAGS+= -DDarwin -PORTEXAMPLES= * PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz +PORTEXAMPLES= * + +OPTIONS_DEFINE= OPENMPI EXAMPLES +OPENMPI_DESC= Use Open MPI instead of MPICH2 .include @@ -38,12 +38,9 @@ do-build: (cd ${WRKSRC} && ${MPICC} ${CFLAGS} -o ${PORTNAME} ${PORTNAME}.c -lm) do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ - ${STAGEDIR}${PREFIX}/bin) - (cd ${WRKSRC} && ${INSTALL_MAN} ${PORTNAME}.1 \ - ${STAGEDIR}${MANPREFIX}/man/man1) + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/scripts && ${INSTALL_DATA} * \ - ${STAGEDIR}${EXAMPLESDIR}) + ${INSTALL_DATA} ${WRKSRC}/scripts/* ${STAGEDIR}${EXAMPLESDIR} .include