Skip to content

Commit 163e469

Browse files
committed
Minor fixes.
1 parent ac39d2e commit 163e469

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

build/Jamfile

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,6 @@ rule lib_boost_numpy ( is-py3 ? )
163163
;
164164
}
165165

166-
lib_boost_python ;
167-
lib_boost_numpy ;
168-
if $(py3-version)
169-
{
170-
lib_boost_python yes ;
171-
lib_boost_numpy yes ;
172-
}
173-
174166
libraries = boost_python ;
175167
libraries3 = boost_python3 ;
176168
if [ python.numpy ]
@@ -179,8 +171,14 @@ if [ python.numpy ]
179171
libraries3 += boost_numpy3 ;
180172
}
181173

182-
boost-install $(libraries) ;
174+
lib_boost_python ;
175+
lib_boost_numpy ;
176+
183177
if $(py3-version)
184178
{
185-
boost-install $(libraries3) ;
179+
lib_boost_python yes ;
180+
lib_boost_numpy yes ;
181+
libraries += $(libraries3) ;
186182
}
183+
184+
boost-install $(libraries) ;

doc/numpy/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPHINXOPTS =
66
SPHINXBUILD = sphinx-build
77
PAPER =
88
BUILDDIR = _build
9-
HTMLDIR = ../numpy/html
9+
HTMLDIR = ../html/numpy
1010

1111
# Internal variables.
1212
PAPEROPT_a4 = -D latex_paper_size=a4

0 commit comments

Comments
 (0)