--- Makefile.in
+++ Makefile.in
@@ -0,0 +1,32 @@
+BJAM=@BJAM@
+TOOLSET=@TOOLSET@
+BJAM_FLAGS=
+BJAM_CONFIG=@BJAM_CONFIG@
+PREFIX=@PREFIX@
+EPREFIX=@EPREFIX@
+LIBDIR=@LIBDIR@
+INCLUDEDIR=@INCLUDEDIR@
+LIBS=@LIBS@
+GXX=c++
+GCC=c++
+DESTDIR=
+
+all: .dummy
+	$(BJAM) $(BJAM_FLAGS) $(BJAM_CONFIG) -sGXX="$(GXX)" -sGCC="$(GCC)" -sTOOLS="$(TOOLSET)" -sBUILD="release <threading>single/multiple" $(LIBS) || \
+	echo "Not all Boost libraries built properly."
+
+clean: .dummy
+	rm -rf bin
+
+distclean: clean
+	rm -rf Makefile config.log
+
+check: .dummy
+	@cd status && ../$(BJAM) $(BJAM_CONFIG) -sTOOLS=$(TOOLSET) test || echo "Some Boost regression tests failed. This is normal."
+
+install: .dummy
+	$(BJAM) $(BJAM_FLAGS) $(BJAM_CONFIG) -sGXX="$(GXX)" -sGCC="$(GCC)" --prefix=$(DESTDIR)$(PREFIX) \
+	--exec-prefix=$(DESTDIR)$(EPREFIX) --libdir=$(DESTDIR)$(LIBDIR) --includedir=$(DESTDIR)$(INCLUDEDIR) \
+	-sTOOLS=$(TOOLSET) -sBUILD="release <threading>single/multiple" $(LIBS) install || echo "Not all Boost libraries built properly."
+
+.dummy:
--- configure
+++ configure
@@ -277,34 +277,12 @@
 
 # Generate the Makefile
 echo "Generating Makefile..."
-cat > Makefile <<EOF
-BJAM=$BJAM
-TOOLSET=$TOOLSET
-BJAM_CONFIG=$BJAM_CONFIG
-PREFIX=$PREFIX
-EPREFIX=$EPREFIX
-LIBDIR=$LIBDIR
-INCLUDEDIR=$INCLUDEDIR
-LIBS=$LIBS
-
-all: .dummy
-	@echo "\$(BJAM) \$(BJAM_CONFIG) -sTOOLS=\$(TOOLSET) \$(LIBS)"
-	@\$(BJAM) \$(BJAM_CONFIG) -sTOOLS=\$(TOOLSET) \$(LIBS) || \\
-	echo "Not all Boost libraries built properly."
-
-clean: .dummy
-	rm -rf bin
-
-distclean: clean
-	rm -rf Makefile config.log
-
-check: .dummy
-	@cd status && ../\$(BJAM) \$(BJAM_CONFIG) -sTOOLS=\$(TOOLSET) test || echo "Some Boost regression tests failed. This is normal."
-
-install: .dummy
-	@echo "\$(BJAM) \$(BJAM_CONFIG) --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) -sTOOLS=\$(TOOLSET) \$(LIBS) install"
-	@\$(BJAM) \$(BJAM_CONFIG) --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) -sTOOLS=\$(TOOLSET) \$(LIBS) install || echo "Not all Boost libraries built properly."
-
-.dummy:
-
-EOF
+sed -e "s!@BJAM@!$BJAM!g" \
+	-e "s!@TOOLSET@!$TOOLSET!g" \
+	-e "s!@BJAM_CONFIG@!$BJAM_CONFIG!g" \
+	-e "s!@PREFIX@!$PREFIX!" \
+	-e "s!@EPREFIX@!$EPREFIX!g" \
+	-e "s!@LIBDIR@!$LIBDIR!g" \
+	-e "s!@INCLUDEDIR@!$INCLUDEDIR!g" \
+	-e "s!@LIBS@!$LIBS!g" \
+	Makefile.in >Makefile