Ticket #1664: configure.diff
File configure.diff, 1.7 KB (added by , 15 years ago) |
---|
-
configure
223 223 224 224 # Setup paths 225 225 if test "x$EPREFIX" = x; then 226 EPREFIX= $PREFIX226 EPREFIX="\$(prefix)" 227 227 fi 228 228 229 229 if test "x$LIBDIR" = x; then 230 LIBDIR=" $EPREFIX/lib"230 LIBDIR="\$(exec_prefix)/lib" 231 231 fi 232 232 233 233 if test "x$INCLUDEDIR" = x; then 234 INCLUDEDIR=" $PREFIX/include"234 INCLUDEDIR="\$(prefix)/include" 235 235 fi 236 236 237 237 # Find Python … … 318 318 cat > Makefile <<EOF 319 319 BJAM=$BJAM 320 320 BJAM_CONFIG=$BJAM_CONFIG 321 PREFIX=$PREFIX322 EPREFIX=$EPREFIX323 LIBDIR=$LIBDIR324 INCLUDEDIR=$INCLUDEDIR321 prefix=$PREFIX 322 exec_prefix=$EPREFIX 323 libdir=$LIBDIR 324 includedir=$INCLUDEDIR 325 325 LIBS=$LIBS 326 326 327 327 all: .dummy … … 339 339 @cd status && ../\$(BJAM) \$(BJAM_CONFIG) --user-config=../user-config.jam || echo "Some Boost regression tests failed. This is normal for many compilers." 340 340 341 341 install: .dummy 342 @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$( PREFIX) --exec-prefix=\$(EPREFIX) --libdir=\$(LIBDIR) --includedir=\$(INCLUDEDIR) \$(LIBS) install"343 @\$(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."342 @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam --prefix=\$(prefix) --exec-prefix=\$(exec_prefix) --libdir=\$(libdir) --includedir=\$(includedir) \$(LIBS) install" 343 @\$(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." 344 344 345 345 .dummy: 346 346