Index: sharemgr/usr/src/lib/libshare/Makefile
===================================================================
--- sharemgr.orig/usr/src/lib/libshare/Makefile	2012-10-08 04:25:42.000000000 +0400
+++ sharemgr/usr/src/lib/libshare/Makefile	2013-09-27 00:31:10.504880652 +0400
@@ -28,8 +28,11 @@
 HDRS =		libshare.h libshare_impl.h scfutil.h
 HDRDIR =	common
 
+ifeq ($(DEB_BUILD_ARCH_BITS),32)
 MACHS = $(MACH)
-$(BUILD64)MACHS += $(MACH64)
+else
+MACHS = $(MACH64)
+endif
 
 # Add plugin module directories here. They need to build after the libshare
 # objects are built.
Index: sharemgr/usr/src/lib/libshare/autofs/Makefile
===================================================================
--- sharemgr.orig/usr/src/lib/libshare/autofs/Makefile	2012-10-08 04:25:42.000000000 +0400
+++ sharemgr/usr/src/lib/libshare/autofs/Makefile	2013-09-27 00:26:32.690716545 +0400
@@ -24,8 +24,11 @@
 
 include ../../Makefile.lib
 
-SUBDIRS =	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
+ifeq ($(DEB_BUILD_ARCH_BITS),32)
+SUBDIRS = $(MACH)
+else
+SUBDIRS = $(MACH64)
+endif
 
 MSGFILES = 	libshare_autofs.c
 POFILE  =	libshare_autofs.po
Index: sharemgr/usr/src/lib/libshare/nfs/Makefile
===================================================================
--- sharemgr.orig/usr/src/lib/libshare/nfs/Makefile	2012-10-08 04:25:42.000000000 +0400
+++ sharemgr/usr/src/lib/libshare/nfs/Makefile	2013-09-27 00:26:32.693023430 +0400
@@ -27,8 +27,11 @@
 
 include ../../Makefile.lib
 
-SUBDIRS =	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
+ifeq ($(DEB_BUILD_ARCH_BITS),32)
+SUBDIRS = $(MACH)
+else
+SUBDIRS = $(MACH64)
+endif
 
 MSGFILES = 	libshare_nfs.c
 POFILE  =	libshare_nfs.po
Index: sharemgr/usr/src/lib/libshare/smb/Makefile
===================================================================
--- sharemgr.orig/usr/src/lib/libshare/smb/Makefile	2012-10-08 04:25:42.000000000 +0400
+++ sharemgr/usr/src/lib/libshare/smb/Makefile	2013-09-27 00:26:32.695001814 +0400
@@ -27,8 +27,11 @@
 
 include ../../Makefile.lib
 
-SUBDIRS =	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
+ifeq ($(DEB_BUILD_ARCH_BITS),32)
+SUBDIRS = $(MACH)
+else
+SUBDIRS = $(MACH64)
+endif
 
 MSGFILES = 	libshare_smb.c
 
Index: sharemgr/usr/src/lib/libshare/smbfs/Makefile
===================================================================
--- sharemgr.orig/usr/src/lib/libshare/smbfs/Makefile	2012-10-08 04:25:42.000000000 +0400
+++ sharemgr/usr/src/lib/libshare/smbfs/Makefile	2013-09-27 00:26:32.696859730 +0400
@@ -27,8 +27,11 @@
 
 include ../../Makefile.lib
 
-SUBDIRS =	$(MACH)
-$(BUILD64)SUBDIRS += $(MACH64)
+ifeq ($(DEB_BUILD_ARCH_BITS),32)
+SUBDIRS = $(MACH)
+else
+SUBDIRS = $(MACH64)
+endif
 
 MSGFILES = 	libshare_smbfs.c
 POFILE  =	libshare_smbfs.po