diff options
| author | rillig <rillig> | 2006-06-24 08:44:33 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2006-06-24 08:44:33 +0000 |
| commit | 8c1fee3636a0e1ea120e54383f0b8792aee79495 (patch) | |
| tree | 3d3a0e573e2fa382ed7f4de77064e39318120142 | |
| parent | 2859ebe5a5b5de0cacd3cd55f093d9b144bfabb9 (diff) | |
| download | pkgsrc-8c1fee3636a0e1ea120e54383f0b8792aee79495.tar.gz | |
Fixed unprivileged builds. Added basic error checking. Bumped PKGREVISION.
| -rw-r--r-- | benchmarks/lmbench/Makefile | 6 | ||||
| -rwxr-xr-x | benchmarks/lmbench/files/do-install | 11 |
2 files changed, 9 insertions, 8 deletions
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile index 25778f5eafa..09742e0a064 100644 --- a/benchmarks/lmbench/Makefile +++ b/benchmarks/lmbench/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2006/06/08 14:58:38 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2006/06/24 08:44:33 rillig Exp $ DISTNAME= lmbench-2alpha11 PKGNAME= lmbench-2.11a -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= benchmarks MASTER_SITES= ftp://ftp.bitmover.com/lmbench/ EXTRACT_SUFX= .tgz @@ -37,7 +37,7 @@ post-configure: ${CHMOD} 0755 ${WRKSRC}/scripts/lmbench do-install: - ${SETENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} \ + ${SETENV} ${MAKE_ENV} PREFIX=${PREFIX} WRKSRC=${WRKSRC} \ INSTALL_PROGRAM=${INSTALL:Q} ${FILESDIR}/do-install .include "../../mk/bsd.prefs.mk" diff --git a/benchmarks/lmbench/files/do-install b/benchmarks/lmbench/files/do-install index fbafa8bf4c4..917283eee2b 100755 --- a/benchmarks/lmbench/files/do-install +++ b/benchmarks/lmbench/files/do-install @@ -1,4 +1,5 @@ #!/bin/sh +set -e cd $WRKSRC DIR=`ls -1d bin/*` @@ -12,19 +13,19 @@ MAN1="bargraph.1 graph.1" mkdir -p $PREFIX/bin/lmbench mkdir -p $PREFIX/share/lmbench for files in $BINS; do - $INSTALL_PROGRAM -c -s -o bin -g bin -m 0755 bin/$OSDIR/$files $PREFIX/bin/lmbench + $BSD_INSTALL_PROGRAM bin/$OSDIR/$files $PREFIX/bin/lmbench done for files in $SCRIPTS; do - $INSTALL_PROGRAM -c -o bin -g bin -m 0755 scripts/$files $PREFIX/bin/lmbench + $BSD_INSTALL_SCRIPT scripts/$files $PREFIX/bin/lmbench done for files in $MAN1; do - $INSTALL_PROGRAM -c -o bin -g bin -m 0444 doc/$files $PREFIX/man/man1 + $BSD_INSTALL_MAN doc/$files $PREFIX/man/man1 done for files in $MAN8; do - $INSTALL_PROGRAM -c -o bin -g bin -m 0444 doc/$files $PREFIX/man/man8 + $BSD_INSTALL_MAN doc/$files $PREFIX/man/man8 done for files in $MAN3; do - $INSTALL_PROGRAM -c -o bin -g bin -m 0444 doc/$files $PREFIX/man/man3 + $BSD_INSTALL_MAN doc/$files $PREFIX/man/man3 done cat <<EOF >$PREFIX/bin/run-lmbench #!/bin/sh |