From 163e469bc4c1a2e1ba171c6e7a82b402e1f559cf Mon Sep 17 00:00:00 2001 From: Stefan Seefeld Date: Wed, 19 Oct 2016 11:25:48 -0400 Subject: [PATCH] Minor fixes. --- build/Jamfile | 18 ++++++++---------- doc/numpy/Makefile | 2 +- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/build/Jamfile b/build/Jamfile index b1ec5784..68481ebd 100644 --- a/build/Jamfile +++ b/build/Jamfile @@ -163,14 +163,6 @@ rule lib_boost_numpy ( is-py3 ? ) ; } -lib_boost_python ; -lib_boost_numpy ; -if $(py3-version) -{ - lib_boost_python yes ; - lib_boost_numpy yes ; -} - libraries = boost_python ; libraries3 = boost_python3 ; if [ python.numpy ] @@ -179,8 +171,14 @@ if [ python.numpy ] libraries3 += boost_numpy3 ; } -boost-install $(libraries) ; +lib_boost_python ; +lib_boost_numpy ; + if $(py3-version) { - boost-install $(libraries3) ; + lib_boost_python yes ; + lib_boost_numpy yes ; + libraries += $(libraries3) ; } + +boost-install $(libraries) ; diff --git a/doc/numpy/Makefile b/doc/numpy/Makefile index c23efca2..f0ffaaea 100644 --- a/doc/numpy/Makefile +++ b/doc/numpy/Makefile @@ -6,7 +6,7 @@ SPHINXOPTS = SPHINXBUILD = sphinx-build PAPER = BUILDDIR = _build -HTMLDIR = ../numpy/html +HTMLDIR = ../html/numpy # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4