--- a/components/pcre/pcre.p5m Wed Mar 30 10:16:56 2016 -0700
+++ b/components/pcre/pcre.p5m Wed Mar 30 13:33:31 2016 -0700
@@ -34,10 +34,11 @@
set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
set name=org.opensolaris.arc-caseid value=PSARC/2012/081
set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/bin/$(MACH64)/pcre-config
-file path=usr/bin/pcre-config
-file usr/bin/$(MACH64)/pcregrep path=usr/bin/pcregrep
-file usr/bin/$(MACH64)/pcretest path=usr/bin/pcretest
+# pcre-config contains embedded paths, so swap these around.
+file usr/bin/pcre-config path=usr/bin/$(MACH64)/pcre-config
+file usr/bin/$(MACH32)/pcre-config path=usr/bin/pcre-config
+file path=usr/bin/pcregrep
+file path=usr/bin/pcretest
file path=usr/include/pcre/pcre.h
file pcre_internal.h path=usr/include/pcre/pcre_internal.h
file path=usr/include/pcre/pcre_scanner.h