Avoid calling gaudi_install_headers twice

Marco Cattaneorequested to merge
cherry-pick-e42e5a03 into 2017-patches

Cherry picked from merge request !721 (merged)

Merge request reports