Cleanup:

  -O2 -> ${CFLAGS}
  ${MKDIR} -> ${INSTALL_DATA_DIR}

7 files changed, 16 insertions, 16 deletions

diff --git a/benchmarks/fib/Makefile b/benchmarks/fib/Makefile
index 105b267e4c2..7aed0b1c67d 100644
--- a/benchmarks/fib/Makefile
+++ b/benchmarks/fib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 13:37:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/31 10:09:04 zuntum Exp $
 
 DISTNAME=		fib.c
 PKGNAME=		fib-980203
@@ -16,7 +16,7 @@ do-extract:
 	${CP} ${DISTDIR}/fib.c ${WRKSRC}/fib.c
 
 do-build:
-	(cd ${WRKSRC} ; ${CC} -O2 -DUNIX -o fib fib.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o fib fib.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fib ${PREFIX}/bin
diff --git a/benchmarks/flops/Makefile b/benchmarks/flops/Makefile
index 45f0795beca..980a43ae962 100644
--- a/benchmarks/flops/Makefile
+++ b/benchmarks/flops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 13:37:48 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/31 10:09:04 zuntum Exp $
 
 DISTNAME=		flops
 PKGNAME=		flops-2.0
@@ -18,11 +18,11 @@ do-extract:
 	${CP} ${DISTDIR}/flops.doc ${WRKSRC}/flops.doc
 
 do-build:
-	(cd ${WRKSRC} ; ${CC} -O2 -DUNIX -o flops flops.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o flops flops.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flops ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/doc/flops
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/flops
 	${INSTALL_DATA} ${WRKSRC}/flops.doc ${PREFIX}/share/doc/flops
 
 benchmark:
diff --git a/benchmarks/heapsort/Makefile b/benchmarks/heapsort/Makefile
index ab481907d9f..e06bdbea1b0 100644
--- a/benchmarks/heapsort/Makefile
+++ b/benchmarks/heapsort/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 13:37:51 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/31 10:09:04 zuntum Exp $
 
 DISTNAME=		heapsort.c
 PKGNAME=		heapsort-1.0
@@ -16,7 +16,7 @@ do-extract:
 	${CP} ${DISTDIR}/heapsort.c ${WRKSRC}/heapsort.c
 
 do-build:
-	(cd ${WRKSRC} ; ${CC} -O2 -DUNIX -o heapsort heapsort.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o heapsort heapsort.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/heapsort ${PREFIX}/bin
diff --git a/benchmarks/linpack/Makefile b/benchmarks/linpack/Makefile
index 5e785cf539d..c8c97c85683 100644
--- a/benchmarks/linpack/Makefile
+++ b/benchmarks/linpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2001/02/16 13:37:54 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/03/31 10:09:04 zuntum Exp $
 
 DISTNAME=		linpackc
 PKGNAME=		linpack-940225
@@ -16,8 +16,8 @@ do-extract:
 	${CP} ${DISTDIR}/linpackc ${WRKSRC}/linpack.c
 
 do-build:
-	(cd ${WRKSRC} ; ${CC} -O2 -DROLL -DDP -o linpackd linpack.c -lm)
-	(cd ${WRKSRC} ; ${CC} -O2 -DROLL -DSP -o linpacks linpack.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DROLL -DDP -o linpackd linpack.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DROLL -DSP -o linpacks linpack.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/linpackd ${PREFIX}/bin
diff --git a/benchmarks/nsieve/Makefile b/benchmarks/nsieve/Makefile
index 285ff507ce9..1de6f8d30ef 100644
--- a/benchmarks/nsieve/Makefile
+++ b/benchmarks/nsieve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 13:37:55 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/03/31 10:09:04 zuntum Exp $
 
 DISTNAME=		nsieve.c
 PKGNAME=		nsieve-1.2b
@@ -16,7 +16,7 @@ do-extract:
 	${CP} ${DISTDIR}/nsieve.c ${WRKSRC}/nsieve.c
 
 do-build:
-	(cd ${WRKSRC} ; ${CC} -O2 -DUNIX -o nsieve nsieve.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -DUNIX -o nsieve nsieve.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/nsieve ${PREFIX}/bin
diff --git a/benchmarks/paranoia/Makefile b/benchmarks/paranoia/Makefile
index 99828737cd4..c01e5410e85 100644
--- a/benchmarks/paranoia/Makefile
+++ b/benchmarks/paranoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:37:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/31 10:09:05 zuntum Exp $
 
 DISTNAME=		paranoia
 PKGNAME=		paranoia-960101
@@ -13,7 +13,7 @@ NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
 do-build:
-	(cd ${WRKSRC} ; ${CC} -ffloat-store -o paranoia paranoia.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -ffloat-store -o paranoia paranoia.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/paranoia ${PREFIX}/bin
diff --git a/benchmarks/whetstone/Makefile b/benchmarks/whetstone/Makefile
index c3155bbf8a5..5db0dd22e8b 100644
--- a/benchmarks/whetstone/Makefile
+++ b/benchmarks/whetstone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2001/02/16 13:37:58 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/03/31 10:09:05 zuntum Exp $
 
 DISTNAME=		whetstone
 PKGNAME=		whetstone-1.2
@@ -13,7 +13,7 @@ NO_WRKSUBDIR=		yes
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
 do-build:
-	(cd ${WRKSRC} ; ${CC} -O2 -o whetstone whetstone.c -lm)
+	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o whetstone whetstone.c -lm)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/whetstone ${PREFIX}/bin