--- a/components/apache2-modules/mod_jk/apache-jk.p5m Wed Mar 25 03:26:21 2015 -0700
+++ b/components/apache2-modules/mod_jk/apache-jk.p5m Thu Mar 19 06:58:47 2015 -0700
@@ -34,10 +34,6 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2008/090
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir path=etc
-dir path=etc/apache2
-dir path=etc/apache2/2.2
-dir path=etc/apache2/2.2/conf.d
file jk.conf path=etc/apache2/2.2/conf.d/jk.conf mode=0644 \
original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/jk.conf \
preserve=renamenew
@@ -45,14 +41,10 @@
mode=0644 \
original_name=SUNWapch22m-jk:etc/apache2/2.2/conf.d/workers.properties \
preserve=renamenew
-dir path=usr
-dir path=usr/apache2
-dir path=usr/apache2/2.2
-dir path=usr/apache2/2.2/libexec
-dir path=usr/apache2/2.2/libexec/$(MACH64)
-file build/$(MACH64)/apache-2.0/mod_jk.so \
+file build/apache22/$(MACH64)/apache-2.0/mod_jk.so \
path=usr/apache2/2.2/libexec/$(MACH64)/mod_jk.so
-file build/$(MACH32)/apache-2.0/mod_jk.so path=usr/apache2/2.2/libexec/mod_jk.so
+file build/apache22/$(MACH32)/apache-2.0/mod_jk.so \
+ path=usr/apache2/2.2/libexec/mod_jk.so
license apache.license license="Apache v2.0"