--- a/components/pam_pkcs11/Makefile	Sat Nov 26 05:55:27 2016 -0800
+++ b/components/pam_pkcs11/Makefile	Sat Nov 26 14:44:47 2016 -0800
@@ -79,10 +79,9 @@
 CONFIGURE_OPTIONS += --with-confdir=/etc/security/pam_pkcs11
 CONFIGURE_OPTIONS += --docdir=/etc/security/pam_pkcs11
 CONFIGURE_OPTIONS += OPENSSL_LIBS="-lssl -lcrypto -lsocket"
-CONFIGURE_OPTIONS.32 += --with-pcsclite=no
-CONFIGURE_OPTIONS.64 += --with-pcsclite=yes
-CONFIGURE_OPTIONS.64 += PCSC_CFLAGS="-I/usr/include/PCSC"
-CONFIGURE_OPTIONS.64 += PCSC_LIBS="-lpcsclite"
+CONFIGURE_OPTIONS += --with-pcsclite=yes
+CONFIGURE_OPTIONS += PCSC_CFLAGS="-I/usr/include/PCSC"
+CONFIGURE_OPTIONS += PCSC_LIBS="-lpcsclite"
 
 # We install only the MozillaLDAP variant. We will cherry-pick binaries built
 # against OpenLDAP out of the build directory to avoid re-installing
@@ -92,6 +91,8 @@
 INSTALL_32_and_64 = $(INSTALL_32) $(INSTALL_64)
 
 # common targets
+configure:	$(CONFIGURE_32_and_64)
+
 build:		$(BUILD_32_and_64)
 
 install:	$(INSTALL_32_and_64)
@@ -104,4 +105,3 @@
 REQUIRED_PACKAGES += shell/bash
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/linker
-