Add install directives and remove export variables