add make step to bootstrap script
Merge remote-tracking branch 'kali/bug/improve-bootstrap-script' into develop