From 53001cf8477cdf313f5a18de47d8fdd459c912a6 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <doug.gregor@gmail.com>
Date: Tue, 29 Apr 2008 18:46:53 +0000
Subject: [PATCH] Merge more configure fixes from the trunk

[SVN r44896]
---
 configure | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index b7f115e000..4e967e6227 100755
--- a/configure
+++ b/configure
@@ -244,15 +244,15 @@ fi
 
 # Setup paths
 if test "x$EPREFIX" = x; then
-  EPREFIX=$PREFIX
+  EPREFIX="\$(prefix)"
 fi
 
 if test "x$LIBDIR" = x; then
-  LIBDIR="$EPREFIX/lib"
+  LIBDIR="\$(exec_prefix)/lib"
 fi
 
 if test "x$INCLUDEDIR" = x; then
-  INCLUDEDIR="$PREFIX/include"
+  INCLUDEDIR="\$(prefix)/include"
 fi
 
 # Find Python
@@ -339,10 +339,10 @@ echo "Generating Makefile..."
 cat > Makefile <<EOF
 BJAM=$BJAM
 BJAM_CONFIG=$BJAM_CONFIG
-PREFIX=$PREFIX
-EPREFIX=$EPREFIX
-LIBDIR=$LIBDIR
-INCLUDEDIR=$INCLUDEDIR
+prefix=$PREFIX
+exec_prefix=$EPREFIX
+libdir=$LIBDIR
+includedir=$INCLUDEDIR
 LIBS=$LIBS
 
 all: .dummy
@@ -360,8 +360,8 @@ check: .dummy
 	@cd status && ../\$(BJAM) \$(BJAM_CONFIG) --user-config=../user-config.jam || echo "Some Boost regression tests failed. This is normal for many compilers."
 
 install: .dummy
-	@echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) \$(LIBS) install"
-	@\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) \$(LIBS) install || echo "Not all Boost libraries built properly."
+	@echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(prefix) --exec-prefix=\$(exec_prefix) --libdir=\$(libdir) --includedir=\$(includedir) \$(LIBS) install"
+	@\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(prefix) --exec-prefix=\$(exec_prefix) --libdir=\$(libdir) --includedir=\$(includedir) \$(LIBS) install || echo "Not all Boost libraries built properly."
 
 .dummy: