Log Message:
ap-* should be using apache1 not apache2. Split out most of the Makefile
into Makefile.common to be used by upcoming ap2-jk package. Bump package
revision