Revise Apache installation around macros.