From: dgregor_at_[hidden]
Date: 2008-04-29 14:46:17
Author: dgregor
Date: 2008-04-29 14:46:17 EDT (Tue, 29 Apr 2008)
New Revision: 44895
URL: http://svn.boost.org/trac/boost/changeset/44895
Log:
Make configure more closely follow autotools conventions. Fixes #1664
Text files modified:
trunk/configure | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
Modified: trunk/configure
==============================================================================
--- trunk/configure (original)
+++ trunk/configure 2008-04-29 14:46:17 EDT (Tue, 29 Apr 2008)
@@ -244,15 +244,15 @@
# 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 @@
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 @@
@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: