--- configure.orig	Mon May 29 09:46:09 2000
+++ configure	Mon Apr  2 11:49:28 2007
@@ -12,7 +12,8 @@
 ###############################################################################
 
 #DEFINES=-DDEBUG
-INSTALLDIR= /usr/local/bin
+INSTALLDIR= \$(PREFIX)/bin
+MANDIR = \$(PREFIX)/man/man8
 
 !
 
@@ -23,7 +24,6 @@
 	case $ARCH in
 	i486)
 cat <<! >> Makefile
-CC = gcc
 CFLAGS = -O2 -m486 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
 LDFLAGS = -s -lm
 INCLUDES = -I.
@@ -32,7 +32,6 @@
 	;;
 	i586)
 cat <<! >> Makefile
-CC = gcc
 CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
 LDFLAGS = -s -lm
 INCLUDES = -I.
@@ -41,7 +40,6 @@
 	;;
 	i686)
 cat <<! >> Makefile
-CC = gcc
 CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2 -fomit-frame-pointer
 LDFLAGS = -s -lm
 INCLUDES = -I.
@@ -50,7 +48,6 @@
 	;;
 	*)
 cat <<! >> Makefile
-CC = gcc
 CFLAGS = -O2 -Wall -malign-loops=2 -malign-jumps=2 -malign-functions=2
 LDFLAGS = -s -lm
 INCLUDES = -I.
@@ -66,7 +63,6 @@
   case ${BITS} in
     64)
 cat <<! >> Makefile
-CC = cc
 CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_64BIT_SERVER -DHPPA64 \\
 -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\
 -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\
@@ -78,7 +74,6 @@
      ;;
    *)
 cat <<! >> Makefile
-CC = cc
 CFLAGS = +O2 -Ae -z -DHPUX +DA2.0W +DS2.0 -DSS_32BIT_SERVER -DHPPA32 \\
 -DSLS8NATIVE -DSLU8NATIVE -D_REENTRANT -DHPUX_KTHREAD -DSLXMX_ENABLE \\
 -DSLMXMX_ENABLE -DSLTS_ENABLE +Omultiprocessor +Olibcalls +Ofastaccess \\
@@ -94,7 +89,6 @@
     ARCH="`oslevel`"
     echo "====  Creating Makefile for ${SYSTEM} ${ARCH}"
 cat <<! >> Makefile
-CC = xlc
 CFLAGS = -O2 -DOSLEVEL=\\\"${ARCH}\\\" -D_XOPEN_SOURCE -D_POSIX_SOURCE -D_ANSI_C_SOURCE -D_ALL_SOURCE
 LDFLAGS = -lm
 INCLUDE = -I.
@@ -104,7 +98,6 @@
   SunOS)
     echo "====  Creating Makefile for ${SYSTEM} ${ARCH}"
 cat <<! >> Makefile
-CC = cc
 CFLAGS = -xO5 -DSunOS
 LDFLAGS = -s -lm
 INCLUDE = -I.
@@ -113,7 +106,6 @@
     ;;
   *)
 cat <<! >> Makefile
-CC = cc
 CFLAGS = 
 LDFLAGS = -lm
 INCLUDES = -I.
@@ -134,11 +126,11 @@
 %.o:	%.c
 	\$(CC) \$(CFLAGS) \$(INCLUDES) -c \$<
 
-default: ubench
+all: ubench
 
 install: ubench
-	mv -f \$(INSTALLDIR)/ubench \$(INSTALLDIR)/ubench.old
-	install -c -m 0555 ubench \$(INSTALLDIR)
+	\$(BSD_INSTALL_MAN) ubench.8 \$(MANDIR)
+	\$(BSD_INSTALL_PROGRAM) ubench \$(INSTALLDIR)
 
 utime:	\$(utimeobjects)
 	\$(CC) \$(CFLAGS) \$(LDFLAGS) -o \$@ \$^