--- configure.orig	Thu Oct 31 09:47:26 2002
+++ configure	Thu Oct 31 10:30:36 2002
@@ -534,33 +534,33 @@
 
 $ECHO -n "	adding rule to install binaries..."
 $ECHO "install-binaries: $BINARIES" >> Makefile
-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(BINDIR)" >> Makefile
+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/bin" >> Makefile
 $ECHO "done"
 for BINARY in $BINARIES; do
 	$ECHO -n "	adding rule to install binary $BINARY..."
-	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(BINDIR)" >> Makefile
+	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $BINARY \$(PREFIX)/bin" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
 
 $ECHO -n "	adding rule to install static libraries..."
 $ECHO "install-static: $STATIC" >> Makefile
-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
 $ECHO "done"
 for LIBRARY in $STATIC; do
 	$ECHO -n "	adding rule to install static library $LIBRARY..."
-	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
+	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
 
 $ECHO -n "	adding rule to install shared libraries..."
 $ECHO "install-shared: $STATIC" >> Makefile
-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(LIBDIR)" >> Makefile
+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/lib" >> Makefile
 $ECHO "done"
 for LIBRARY in $SHARED; do
 	$ECHO -n "	adding rule to install shared library $LIBRARY..."
-	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(LIBDIR)" >> Makefile
+	$ECHO "	install -m 0755 -o \$(INSTALL_USER) $LIBRARY \$(PREFIX)/lib" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
@@ -577,10 +577,10 @@
 	$ECHO "no firemake.headers found"
 fi
 $ECHO "install-headers: $HEADERS" >> Makefile
-$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(INCLUDEDIR)" >> Makefile
+$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/include" >> Makefile
 for HEADER in $HEADERS; do
 	$ECHO -n "	adding rule to install header $HEADER..."
-	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(INCLUDEDIR)" >> Makefile
+	$ECHO "	install -m 0644 -o \$(INSTALL_USER) $HEADER \$(PREFIX)/include" >> Makefile
 	$ECHO "done"
 done;
 $ECHO >> Makefile
@@ -592,8 +592,8 @@
 	LS=`ls man/*.$SECTION 2>>configure.log`
 	if test "$LS" != ""; then
 		$ECHO "man/*.$SECTION" >> Makefile
-		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(MANDIR)/man$SECTION" >> Makefile
-		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(MANDIR)/man$SECTION" >> Makefile
+		$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/man/man$SECTION" >> Makefile
+		$ECHO "	install -m 0644 -o \$(INSTALL_USER) man/*.$SECTION \$(PREFIX)/man/man$SECTION" >> Makefile
 		$ECHO "done"
 	else
 		$ECHO >> Makefile
@@ -618,9 +618,9 @@
 		$ECHO -n "conf/$CONF " >> Makefile
 	done
 	$ECHO >> Makefile
-	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(CONFDIR)" >> Makefile
+	$ECHO "	install -d -m 0755 -o \$(INSTALL_USER) \$(PREFIX)/etc" >> Makefile
 	for CONF in $CONFS; do
-		$ECHO "	if test ! -f \$(CONFDIR)/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(CONFDIR); fi" >> Makefile
+		$ECHO "	if test ! -f \$(PREFIX)/etc/$CONF; then install -m 0644 -o \$(INSTALL_USER) conf/$CONF \$(PREFIX)/etc; fi" >> Makefile
 	done
 	$ECHO "done"
 else