--- a/components/openldap/openldap.p5m	Wed Mar 30 10:16:56 2016 -0700
+++ b/components/openldap/openldap.p5m	Wed Mar 30 13:33:31 2016 -0700
@@ -85,22 +85,22 @@
 # The bypasses (and manual dependency on libsasl at the end of the file)
 # are required for building with the cyrus-sasl proto area because of
 # libsasl version depency checks in openldap code.
-file usr/bin/$(MACH64)/ldapcompare path=usr/bin/openldapcompare \
+file usr/bin/ldapcompare path=usr/bin/openldapcompare \
     pkg.depend.bypass-generate=libsasl2.so.3
-file usr/bin/$(MACH64)/ldapdelete path=usr/bin/openldapdelete \
+file usr/bin/ldapdelete path=usr/bin/openldapdelete \
     pkg.depend.bypass-generate=libsasl2.so.3
-file usr/bin/$(MACH64)/ldapexop path=usr/bin/openldapexop \
+file usr/bin/ldapexop path=usr/bin/openldapexop \
     pkg.depend.bypass-generate=libsasl2.so.3
-file usr/bin/$(MACH64)/ldapmodify path=usr/bin/openldapmodify \
+file usr/bin/ldapmodify path=usr/bin/openldapmodify \
     pkg.depend.bypass-generate=libsasl2.so.3
-file usr/bin/$(MACH64)/ldapmodrdn path=usr/bin/openldapmodrdn \
+file usr/bin/ldapmodrdn path=usr/bin/openldapmodrdn \
     pkg.depend.bypass-generate=libsasl2.so.3
-file usr/bin/$(MACH64)/ldappasswd path=usr/bin/openldappasswd \
+file usr/bin/ldappasswd path=usr/bin/openldappasswd \
     pkg.depend.bypass-generate=libsasl2.so.3
-file usr/bin/$(MACH64)/ldapsearch path=usr/bin/openldapsearch \
+file usr/bin/ldapsearch path=usr/bin/openldapsearch \
     pkg.depend.bypass-generate=libsasl2.so.3
-file usr/bin/$(MACH64)/ldapurl path=usr/bin/openldapurl
-file usr/bin/$(MACH64)/ldapwhoami path=usr/bin/openldapwhoami \
+file usr/bin/ldapurl path=usr/bin/openldapurl
+file usr/bin/ldapwhoami path=usr/bin/openldapwhoami \
     pkg.depend.bypass-generate=libsasl2.so.3
 file path=usr/include/openldap/lber.h
 file path=usr/include/openldap/lber_types.h