organicmaps/boost
13
Fork 0
mirror of https://github.com/boostorg/boost.git synced 2025-04-13 08:33:00 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Merge more configure fixes from the trunk

Browse source 
[SVN r44896]
This commit is contained in:
Douglas Gregor 2008-04-29 18:46:53 +00:00
parent 2b9120b6b5
commit 53001cf847
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
configure vendored
View file

@ -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: