--- makefile.boot.in.old	2006-10-07 12:49:12.000000000 +0200
+++ makefile.boot.in	2006-10-07 13:42:22.000000000 +0200
@@ -6,6 +6,7 @@
 #
 prefix=@prefix@
 srcdir=@srcdir@
+mandir=@mandir@
 VPATH=.:$(srcdir)
 CC=@CC@
 INSTALL=$(srcdir)/install-sh
@@ -24,7 +25,7 @@
 
 bootstrap:	bmake.boot .mk.done
 	${BMAKE_ENV} ./bmake.boot -f Makefile 
-	${BMAKE_ENV} `pwd`/bmake -f Makefile test
+#	${BMAKE_ENV} `pwd`/bmake -f Makefile test
 	
 bmake:	bmake.boot
 	@echo you might want to try: 
@@ -48,12 +49,12 @@
 install:	install-bin install-man install-mk
 
 install-bin:
-	test -d ${prefix}/bin || ${INSTALL} -m 755 -d ${prefix}/bin
-	${INSTALL} -m 755 bmake ${prefix}/bin
+	test -d ${DESTDIR}${prefix}/bin || ${INSTALL} -m 755 -d ${DESTDIR}${prefix}/bin
+	${INSTALL} -m 755 ${srcdir}/bmake ${DESTDIR}${prefix}/bin
 
 install-man:
-	test -d ${prefix}/man/cat1 || ${INSTALL} -m 755 -d ${prefix}/man/cat1
-	${INSTALL} -m 444 ${srcdir}/bmake.cat1 ${prefix}/man/cat1/bmake.1
+	test -d ${DESTDIR}${mandir}/man1 || ${INSTALL} -m 755 -d ${DESTDIR}${mandir}/man1
+	${INSTALL} -m 444 ${srcdir}/bmake.cat1 ${DESTDIR}${mandir}/man1/bmake.1
 
 install-mk:
 	@if test -s ${MKSRC}/install-mk; then \