Merge branch 'develop'

stefanseefeld · stefanseefeld · commit 7d3df3d3a7ac · 2017-03-28T12:57:32.000-04:00
diff --git a/build/Jamfile b/build/Jamfile
@@ -124,8 +124,8 @@ rule lib_boost_python ( version )
 lib_boost_numpy(2) = boost_numpy ;
 lib_boost_numpy(3) = boost_numpy3 ;
 
-lib_boost_numpy($(py2-version)) = $(lib_boost_python(2)) ;
-lib_boost_numpy($(py3-version)) = $(lib_boost_python(3)) ;
+lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;
+lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;
 
 rule lib_boost_numpy ( version )
 {

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,8 @@ rule lib_boost_python ( version )`
`124`	`124`	`lib_boost_numpy(2) = boost_numpy ;`
`125`	`125`	`lib_boost_numpy(3) = boost_numpy3 ;`
`126`	`126`
`127`		`-lib_boost_numpy($(py2-version)) = $(lib_boost_python(2)) ;`
`128`		`-lib_boost_numpy($(py3-version)) = $(lib_boost_python(3)) ;`
	`127`	`+lib_boost_numpy($(py2-version)) = $(lib_boost_numpy(2)) ;`
	`128`	`+lib_boost_numpy($(py3-version)) = $(lib_boost_numpy(3)) ;`
`129`	`129`
`130`	`130`	`rule lib_boost_numpy ( version )`
`131`	`131`	`{`