Use make variable instead of environment variable
Merge pull request #1581 from rubenk/travis-tweak

Use make variable instead of environment variable