Replace three 'test ... && ...' sequences with 'if ... then ... fi',
since the test form would fail, causing some non-GNU makes to bomb
out (maybe they invoke sh with -e?).