--- configure.orig	Sun Sep 22 06:37:40 2002
+++ configure	Thu Oct 31 12:44:24 2002
@@ -322,7 +322,7 @@
 $ECHO "INCLUDEDIR ?= \$(PREFIX)/include" >> Makefile
 $ECHO "MANDIR ?= \$(PREFIX)/man" >> Makefile
 $ECHO "CONFDIR ?= \$(PREFIX)/etc" >> Makefile
-$ECHO "INSTALL_GROUP ?= root" >> Makefile
+$ECHO "INSTALL_GROUP ?= wheel" >> Makefile
 $ECHO "INSTALL_USER ?= root" >> Makefile
 
 $ECHO "LIBS := \$(LIBS) $INLIBS" >> Makefile
@@ -517,7 +517,7 @@
 $ECHO "done"
 for BINARY in $BINARIES; do
 	$ECHO -n "	adding rule to install binary $BINARY..."
-	$ECHO "	./install.sh $BINARY \$(BINDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
+	$ECHO "	./install.sh $BINARY \$(PREFIX)/bin \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
@@ -527,7 +527,7 @@
 $ECHO "done"
 for LIBRARY in $STATIC; do
 	$ECHO -n "	adding rule to install static library $LIBRARY..."
-	$ECHO "	./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
+	$ECHO "	./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
@@ -537,7 +537,7 @@
 $ECHO "done"
 for LIBRARY in $SHARED; do
 	$ECHO -n "	adding rule to install shared library $LIBRARY..."
-	$ECHO "	./install.sh $LIBRARY \$(LIBDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
+	$ECHO "	./install.sh $LIBRARY \$(PREFIX)/lib \$(INSTALL_USER) \$(INSTALL_GROUP) 0755" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
@@ -556,7 +556,7 @@
 $ECHO "install-headers: $HEADERS" >> Makefile
 for HEADER in $HEADERS; do
 	$ECHO -n "	adding rule to install header $HEADER..."
-	$ECHO "	./install.sh $HEADER \$(INCLUDEDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
+	$ECHO "	./install.sh $HEADER \$(PREFIX)/include \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
@@ -569,7 +569,7 @@
 	if test "$LS" != ""; then
 		$ECHO $LS >> Makefile
 		for MANPAGE in $LS; do
-			$ECHO "	./install.sh $MANPAGE \$(MANDIR)/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
+			$ECHO "	./install.sh $MANPAGE \$(PREFIX)/man/man$SECTION \$(INSTALL_USER) \$(INSTALL_GROUP) 0644" >> Makefile
 		done;
 		$ECHO "done"
 	else
@@ -596,7 +596,7 @@
 	done
 	$ECHO >> Makefile
 	for CONF in $CONFS; do
-		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then ./install.sh conf/$CONF \$(CONFDIR) \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
+		$ECHO "	if test ! -f \$(PREFIX)/etc/$CONF; then ./install.sh conf/$CONF \$(PREFIX)/etc \$(INSTALL_USER) \$(INSTALL_GROUP) 0644; fi" >> Makefile
 	done
 	$ECHO "done"
 else
