--- a/components/ruby/facter/Makefile	Wed Aug 24 15:36:10 2016 -0700
+++ b/components/ruby/facter/Makefile	Wed Aug 24 16:30:50 2016 -0700
@@ -51,9 +51,9 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
-build:		$(BUILD_64)
+build:		$(BUILD_NO_ARCH)
 
-install:	$(INSTALL_64)
+install:	$(INSTALL_NO_ARCH)
 
 # facter requires the installation of the following rubygems to run
 # the unittests:  rspec rspec-expectations mocha rake rack hiera

--- a/components/ruby/hiera/Makefile	Wed Aug 24 15:36:10 2016 -0700
+++ b/components/ruby/hiera/Makefile	Wed Aug 24 16:30:50 2016 -0700
@@ -50,9 +50,9 @@
 
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
-build:		$(BUILD_64)
+build:		$(BUILD_NO_ARCH)
 
-install:	$(INSTALL_64)
+install:	$(INSTALL_NO_ARCH)
 
 test:		$(NO_TESTS)
 

--- a/components/ruby/mcollective/Makefile	Wed Aug 24 15:36:10 2016 -0700
+++ b/components/ruby/mcollective/Makefile	Wed Aug 24 16:30:50 2016 -0700
@@ -87,9 +87,9 @@
       < patches/03-mco-service-name
 
 # common targets
-build:		$(BUILD_64)
+build:		$(BUILD_NO_ARCH)
 
-install:	$(INSTALL_64)
+install:	$(INSTALL_NO_ARCH)
 
 test:		$(NO_TESTS)
 

--- a/components/ruby/puppet/Makefile	Wed Aug 24 15:36:10 2016 -0700
+++ b/components/ruby/puppet/Makefile	Wed Aug 24 16:30:50 2016 -0700
@@ -74,10 +74,10 @@
 PKG_OPTIONS +=	-I $(BUILD_DIR)
 
 # common targets
-build::		$(BUILD_64)
+build::		$(BUILD_NO_ARCH)
 
 # make sure facter and hiera are installed first
-install:	../facter/build/$(MACH64)/.installed ../hiera/build/$(MACH64)/.installed $(INSTALL_64)
+install:	../facter/build/$(MACH)/.installed ../hiera/build/$(MACH)/.installed $(INSTALL_NO_ARCH)
 
 clean::
 

--- a/components/ruby/stomp/Makefile	Wed Aug 24 15:36:10 2016 -0700
+++ b/components/ruby/stomp/Makefile	Wed Aug 24 16:30:50 2016 -0700
@@ -56,9 +56,9 @@
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 # common targets
-build:		$(BUILD_64)
+build:		$(BUILD_NO_ARCH)
 
-install:	$(INSTALL_64)
+install:	$(INSTALL_NO_ARCH)
 
 test:		$(NO_TESTS)