diff options
| author | reed <reed@pkgsrc.org> | 2005-12-29 03:26:28 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2005-12-29 03:26:28 +0000 |
| commit | 382dff173a53b951a023167ba1c9595a2ca3823d (patch) | |
| tree | e2c685ac6bbec2af8412a63c2909d319ef502439 /benchmarks | |
| parent | 91abe4f16b73d2725b289e001c9d62fbc2930b36 (diff) | |
| download | pkgsrc-382dff173a53b951a023167ba1c9595a2ca3823d.tar.gz | |
Doesn't hide the output from the post-configure and do-install steps (I
needed for troubleshooting). And use BINOWN and BINGRP because user "bin"
and group "bin" don't exist on some systems.
Use BSD_INSTALL_PROGRAM, BSD_INSTALL_DATA and BSD_INSTALL_SCRIPT
instead of calling /usr/bin/install directly.
Okayed by maintainer.
Bumped PKGREVISION, since ownership of files may be different on
some systems.
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/hbench/Makefile | 11 | ||||
| -rwxr-xr-x | benchmarks/hbench/files/do-install | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/benchmarks/hbench/Makefile b/benchmarks/hbench/Makefile index 99e1d760120..408caa564cf 100644 --- a/benchmarks/hbench/Makefile +++ b/benchmarks/hbench/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.31 2005/07/16 19:10:37 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/29 03:26:28 reed Exp $ DISTNAME= hbench-OS-1.0 PKGNAME= hbench-1.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= benchmarks MASTER_SITES= http://www.eecs.harvard.edu/vino/perf/hbench/ @@ -22,7 +22,7 @@ USE_TOOLS+= perl:run DIST_SUBDIR= ${PKGNAME_NOREV} post-configure: - @cd ${WRKSRC}; \ + cd ${WRKSRC}; \ for f in scripts/create-all-analyses \ scripts/create-all-latgraphs \ scripts/create-all-summaries scripts/gen-analysis \ @@ -32,10 +32,11 @@ post-configure: ${MV} $$f $$f.in; \ ${SED} -e 's|@PREFIX@|${PREFIX}|g' $$f.in > $$f; \ done - @ ${CHMOD} 0755 ${WRKSRC}/scripts/* + ${CHMOD} 0755 ${WRKSRC}/scripts/* do-install: - @${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} ${FILESDIR}/do-install + ${SETENV} ${MAKE_ENV} WRKSRC=${WRKSRC} BINOWN=${BINOWN} \ + BINGRP=${BINGRP} ${FILESDIR}/do-install benchmark: @if [ `id -u` != 0 ]; then ${ECHO} "This benchmark must be run as root!" ; exit 1 ; fi diff --git a/benchmarks/hbench/files/do-install b/benchmarks/hbench/files/do-install index 52973c63997..220c5210369 100755 --- a/benchmarks/hbench/files/do-install +++ b/benchmarks/hbench/files/do-install @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: do-install,v 1.1 2001/10/26 12:54:24 agc Exp $ +# $NetBSD: do-install,v 1.2 2005/12/29 03:26:28 reed Exp $ # cd $WRKSRC @@ -15,22 +15,22 @@ mkdir -p $PREFIX/share/hbench/Results for basedir in $DIRS; do OSDIR=`basename $basedir` mkdir -p $PREFIX/bin/hbench/$OSDIR - /usr/bin/install -c -s -o bin -g bin -m 0755 bin/$OSDIR/* $PREFIX/bin/hbench/$OSDIR + $BSD_INSTALL_PROGRAM bin/$OSDIR/* $PREFIX/bin/hbench/$OSDIR done for files in $SCRIPTS; do - /usr/bin/install -c -o bin -g bin -m 0755 scripts/$files $PREFIX/bin/hbench + $BSD_INSTALL_SCRIPT scripts/$files $PREFIX/bin/hbench done mkdir -p $PREFIX/share/doc/hbench for files in $DOCS; do - /usr/bin/install -c -o bin -g bin -m 0444 doc/$files $PREFIX/share/doc/hbench + $BSD_INSTALL_DATA doc/$files $PREFIX/share/doc/hbench done cat <<EOF >$PREFIX/bin/run-hbench #!/bin/sh ${PREFIX}/bin/hbench/interactive-setup ${PREFIX}/bin/hbench/maindriver ${PREFIX}/share/hbench/conf/`hostname`.run EOF -chown bin:bin ${PREFIX}/bin/run-hbench +chown $BINOWN:$BINGRP ${PREFIX}/bin/run-hbench chmod 0755 ${PREFIX}/bin/run-hbench cp Results/Makefile $PREFIX/share/hbench/Results cp -R conf $PREFIX/share/hbench |