--- a/components/apache2-modules/modules.mk	Tue Dec 08 14:36:41 2015 -0800
+++ b/components/apache2-modules/modules.mk	Wed Nov 25 05:01:40 2015 -0800
@@ -21,48 +21,37 @@
 # Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
-APACHE_22_USR_PREFIX=/usr/apache2/2.2
+MODULES_CONFIGURE = $(CONFIGURE_64)
+MODULES_BUILD = $(BUILD_64)
+MODULES_INSTALL = $(INSTALL_64)
+MODULES_TEST = $(TEST_64)
+
 APACHE_24_USR_PREFIX=/usr/apache2/2.4
 
-VARIANT_APACHE_22 =	$(BUILD_DIR)/apache22
 VARIANT_APACHE_24 =	$(BUILD_DIR)/apache24
 
-VARIANTS_32 = $(VARIANT_APACHE_22)
 VARIANTS_64 = $(VARIANT_APACHE_22) $(VARIANT_APACHE_24)
 
-BUILD_32 = $(VARIANTS_32:%=%/$(MACH32)/.built)
 BUILD_64 = $(VARIANTS_64:%=%/$(MACH64)/.built)
 
-INSTALL_32 = $(VARIANTS_32:%=%/$(MACH32)/.installed)
 INSTALL_64 = $(VARIANTS_64:%=%/$(MACH64)/.installed)
 
-TEST_32 = $(VARIANTS_32:%=%/$(MACH32)/.tested)
 TEST_64 = $(VARIANTS_64:%=%/$(MACH64)/.tested)
 
-$(VARIANT_APACHE_22)/$(MACH64)/.configured: BITS=64
 $(VARIANT_APACHE_24)/$(MACH64)/.configured: BITS=64
 
-$(VARIANT_APACHE_22)/$(MACH64)/.built: BITS=64
 $(VARIANT_APACHE_24)/$(MACH64)/.built: BITS=64
 
-$(VARIANT_APACHE_22)/$(MACH64)/.tested: BITS=64
 $(VARIANT_APACHE_24)/$(MACH64)/.tested: BITS=64
 
-$(VARIANT_APACHE_22)/%/.configured: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
 $(VARIANT_APACHE_24)/%/.configured: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
 
-$(VARIANT_APACHE_22)/%/.built: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
 $(VARIANT_APACHE_24)/%/.built: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
 
-$(VARIANT_APACHE_22)/%/.installed: APACHE_USR_PREFIX=$(APACHE_22_USR_PREFIX)
 $(VARIANT_APACHE_24)/%/.installed: APACHE_USR_PREFIX=$(APACHE_24_USR_PREFIX)
 
-$(BUILD_DIR)/apache22/$(MACH32)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/apxs
-$(BUILD_DIR)/apache22/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
 $(BUILD_DIR)/apache24/$(MACH64)/.configured: APXS=$(APACHE_USR_PREFIX)/bin/apxs
 
-$(BUILD_DIR)/apache22/$(MACH32)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
-$(BUILD_DIR)/apache22/$(MACH64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/$(MACH64)/apxs
 $(BUILD_DIR)/apache24/$(MACH64)/.built: APXS=$(APACHE_USR_PREFIX)/bin/apxs
 
 DEFAULT_COMPILER?=yes
@@ -77,5 +66,4 @@
 PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
 endif
 
-REQUIRED_PACKAGES += web/server/apache-22
 REQUIRED_PACKAGES += web/server/apache-24