Revert "Instead of specially filtering out lib/pam, use the commands macro"

Unfortunately this support explicitly requires bmake and breaks on systems
that do not compile it as the default make.

This reverts commit eb5946a80a4e6103a7236b23e65cbebd85c82e5c.
Merge branch 'master' into conf-163778